Fix POSIX shell differences of Alpine and Debian in occ and occ-cron

Signed-off-by: Daniel Rudolf <[email protected]>
nextcloud · Dec 15, 2023 · 512dcf2 · 512dcf2
1 parent a084db4
commit 512dcf2
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/26/apache/occ-cron b/26/apache/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/26/fpm-alpine/occ-cron b/26/fpm-alpine/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/26/fpm/occ-cron b/26/fpm/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/27/apache/occ-cron b/27/apache/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/27/fpm-alpine/occ-cron b/27/fpm-alpine/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/27/fpm/occ-cron b/27/fpm/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/28/apache/occ-cron b/28/apache/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/28/fpm-alpine/occ-cron b/28/fpm-alpine/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/28/fpm/occ-cron b/28/fpm/occ-cron
@@ -13,7 +13,7 @@ RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
 if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/docker-occ-cron.sh b/docker-occ-cron.sh
@@ -12,8 +12,8 @@ fi
 RUN_AS="$(stat -c %U /var/www/html/cron.php)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
-if [ "$(id -u)" == 0 ]; then
-    exec su -p "$RUN_AS" -s /bin/sh -c 'php -f /var/www/html/cron.php' -- '/bin/sh'
+if [ "$(id -u)" = 0 ]; then
+    exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
 else
     exec php -f /var/www/html/cron.php
 fi
diff --git a/docker-occ.sh b/docker-occ.sh
@@ -7,7 +7,7 @@ set -eu
 RUN_AS="$(stat -c %U /var/www/html/occ)"
 [ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ\`: Failed to determine www-data user" >&2 ; exit 1 ; }
 
-if [ "$(id -u)" == 0 ]; then
+if [ "$(id -u)" = 0 ]; then
     exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/occ -- "$@"' -- '/bin/sh' "$@"
 else
     exec php -f /var/www/html/occ -- "$@"