From 93d2fd5eb82e44cda089a1affa8bac2b67341b05 Mon Sep 17 00:00:00 2001
From: HowRuck <ertus123123@gmail.com>
Date: Wed, 8 Jan 2025 00:49:17 +0100
Subject: [PATCH] Fix sed command to replace @PACKAGE_VERSION@ with git commit
 hash

Signed-off-by: HowRuck <ertus123123@gmail.com>
---
 28/apache/Dockerfile       | 6 +++---
 28/fpm-alpine/Dockerfile   | 6 +++---
 28/fpm/Dockerfile          | 6 +++---
 29/apache/Dockerfile       | 6 +++---
 29/fpm-alpine/Dockerfile   | 6 +++---
 29/fpm/Dockerfile          | 6 +++---
 30/apache/Dockerfile       | 6 +++---
 30/fpm-alpine/Dockerfile   | 6 +++---
 30/fpm/Dockerfile          | 6 +++---
 Dockerfile-alpine.template | 2 +-
 Dockerfile-debian.template | 2 +-
 11 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile
index 343dcb98..27168543 100644
--- a/28/apache/Dockerfile
+++ b/28/apache/Dockerfile
@@ -80,7 +80,7 @@ RUN set -ex; \
     cd /tmp/imagick && \
     git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
     git checkout ${IMAGICK_COMMIT_HASH} && \
-    sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
+    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
     phpize && ./configure && make && make install && \
     cd && rm -r /tmp/imagick; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \
@@ -170,8 +170,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile
index 773b4313..6b27eb71 100644
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@@ -75,7 +75,7 @@ RUN set -ex; \
     && cd /tmp/imagick \
     && git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} \
     && git checkout ${IMAGICK_COMMIT_HASH} \
-    && sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH:0:7}/" php_imagick.h \
+    && sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h \
     && phpize && ./configure && make && make install; \
     apk del .git-build-deps; \
     cd && rm -r /tmp/imagick; \
@@ -145,8 +145,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile
index 47f92228..4c9db1f3 100644
--- a/28/fpm/Dockerfile
+++ b/28/fpm/Dockerfile
@@ -80,7 +80,7 @@ RUN set -ex; \
     cd /tmp/imagick && \
     git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
     git checkout ${IMAGICK_COMMIT_HASH} && \
-    sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
+    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
     phpize && ./configure && make && make install && \
     cd && rm -r /tmp/imagick; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \
@@ -155,8 +155,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile
index 0f12015e..42e5e2d8 100644
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@@ -80,7 +80,7 @@ RUN set -ex; \
     cd /tmp/imagick && \
     git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
     git checkout ${IMAGICK_COMMIT_HASH} && \
-    sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
+    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
     phpize && ./configure && make && make install && \
     cd && rm -r /tmp/imagick; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \
@@ -170,8 +170,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile
index 394ddbd3..df2cb65f 100644
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@@ -75,7 +75,7 @@ RUN set -ex; \
     && cd /tmp/imagick \
     && git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} \
     && git checkout ${IMAGICK_COMMIT_HASH} \
-    && sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH:0:7}/" php_imagick.h \
+    && sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h \
     && phpize && ./configure && make && make install; \
     apk del .git-build-deps; \
     cd && rm -r /tmp/imagick; \
@@ -145,8 +145,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile
index edcc270a..cadc4d61 100644
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@@ -80,7 +80,7 @@ RUN set -ex; \
     cd /tmp/imagick && \
     git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
     git checkout ${IMAGICK_COMMIT_HASH} && \
-    sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
+    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
     phpize && ./configure && make && make install && \
     cd && rm -r /tmp/imagick; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \
@@ -155,8 +155,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 2f696297..1496573a 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -80,7 +80,7 @@ RUN set -ex; \
     cd /tmp/imagick && \
     git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
     git checkout ${IMAGICK_COMMIT_HASH} && \
-    sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
+    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
     phpize && ./configure && make && make install && \
     cd && rm -r /tmp/imagick; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \
@@ -170,8 +170,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index c0ac5ef1..202cb28b 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -75,7 +75,7 @@ RUN set -ex; \
     && cd /tmp/imagick \
     && git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} \
     && git checkout ${IMAGICK_COMMIT_HASH} \
-    && sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH:0:7}/" php_imagick.h \
+    && sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h \
     && phpize && ./configure && make && make install; \
     apk del .git-build-deps; \
     cd && rm -r /tmp/imagick; \
@@ -145,8 +145,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index 5912e173..08fd5295 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -80,7 +80,7 @@ RUN set -ex; \
     cd /tmp/imagick && \
     git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
     git checkout ${IMAGICK_COMMIT_HASH} && \
-    sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
+    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
     phpize && ./configure && make && make install && \
     cd && rm -r /tmp/imagick; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \
@@ -155,8 +155,8 @@ RUN set -ex; \
     curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    #gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
-    #gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
     rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 5dd20382..7009a125 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -74,7 +74,7 @@ RUN set -ex; \
     && cd /tmp/imagick \
     && git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} \
     && git checkout ${IMAGICK_COMMIT_HASH} \
-    && sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH:0:7}/" php_imagick.h \
+    && sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h \
     && phpize && ./configure && make && make install; \
     apk del .git-build-deps; \
     cd && rm -r /tmp/imagick; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 3fdd71c0..52803ef5 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -79,7 +79,7 @@ RUN set -ex; \
     cd /tmp/imagick && \
     git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} && \
     git checkout ${IMAGICK_COMMIT_HASH} && \
-    sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH} | cut -c 1-7f/" php_imagick.h && \
+    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h && \
     phpize && ./configure && make && make install && \
     cd && rm -r /tmp/imagick; \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false git libmagickwand-dev; \