All of lore.kernel.org
 help / color / mirror / Atom feed
From: Akira Yokosawa <akiyks@gmail.com>
To: "Paul E. McKenney" <paulmck@kernel.org>
Cc: perfbook@vger.kernel.org, Akira Yokosawa <akiyks@gmail.com>
Subject: [PATCH -perfbook] docker: Cope with change in latexpand-v1.3.tar.gz from gitlab
Date: Wed, 29 Mar 2023 22:30:47 +0900	[thread overview]
Message-ID: <c25e014e-9fe0-8007-cebd-ba7b1e171fd4@gmail.com> (raw)

latexpand-v1.3.tar.gz downloaded from gitlab has changed slightly
and latexpand (script) is now extracted under latexpand-<commit-id>/.

Use wildcard for the directory name.

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
Hi Paul,

I'm working on rewriting these Dockerfiles, but it is not ready.
Please apply this urgent fix in case there is somebody who wants to
build an image on their own.

        Thanks, Akira
--
 docker/Dockerfile        | 4 ++--
 docker/Dockerfile.fedora | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3a3991bbe09e..1fec609a0043 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,8 +14,8 @@ COPY steel-city-comic.regular.ttf /usr/local/share/fonts/
 RUN fc-cache /usr/local/share/fonts/
 WORKDIR /opt
 RUN curl https://gitlab.com/latexpand/latexpand/-/archive/v1.3/latexpand-v1.3.tar.gz -o - | tar xfz - && \
-    sed -i -e 's/@LATEXPAND_VERSION@/v1.3/' latexpand-v1.3/latexpand && \
-    cp latexpand-v1.3/latexpand /usr/local/bin
+    sed -i -e 's/@LATEXPAND_VERSION@/v1.3/' latexpand-*/latexpand && \
+    cp latexpand-*/latexpand /usr/local/bin
 ARG uid=1000
 ARG gid=1000
 ARG user=perfbook
diff --git a/docker/Dockerfile.fedora b/docker/Dockerfile.fedora
index 916339488851..ff56ac4c751e 100644
--- a/docker/Dockerfile.fedora
+++ b/docker/Dockerfile.fedora
@@ -14,8 +14,8 @@ COPY steel-city-comic.regular.ttf /usr/local/share/fonts/
 RUN fc-cache /usr/local/share/fonts/
 WORKDIR /opt
 RUN curl https://gitlab.com/latexpand/latexpand/-/archive/v1.3/latexpand-v1.3.tar.gz -o - | tar xfz - && \
-    sed -i -e 's/@LATEXPAND_VERSION@/v1.3/' latexpand-v1.3/latexpand && \
-    cp latexpand-v1.3/latexpand /usr/local/bin
+    sed -i -e 's/@LATEXPAND_VERSION@/v1.3/' latexpand-*/latexpand && \
+    cp latexpand-*/latexpand /usr/local/bin
 ARG uid=1000
 ARG gid=1000
 ARG user=perfbook

base-commit: 3f8f4bf82c2cf1947b8dcef6af1daf71ba4feff1
-- 
2.25.1


             reply	other threads:[~2023-03-29 13:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-29 13:30 Akira Yokosawa [this message]
2023-03-29 23:25 ` [PATCH -perfbook] docker: Cope with change in latexpand-v1.3.tar.gz from gitlab Paul E. McKenney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c25e014e-9fe0-8007-cebd-ba7b1e171fd4@gmail.com \
    --to=akiyks@gmail.com \
    --cc=paulmck@kernel.org \
    --cc=perfbook@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.