[PATCH -perfbook] docker: Cope with change in latexpand-v1.3.tar.gz from gitlab

[PATCH -perfbook] docker: Cope with change in latexpand-v1.3.tar.gz from gitlab

[Akira Yokosawa]

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

Re: [PATCH -perfbook] docker: Cope with change in latexpand-v1.3.tar.gz from gitlab

[Paul E. McKenney]

On Wed, Mar 29, 2023 at 10:30:47PM +0900, Akira Yokosawa wrote:
> 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.

Queued and pushed, thank you!

							Thanx, Paul

>         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
>