From e6f4300979a25d79b0f22f4fa9d2a24f12661294 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 31 Mar 2023 22:10:26 +0200 Subject: [PATCH] Correct PUID --- nextcloud/CHANGELOG.md | 2 -- nextcloud/config.json | 2 +- nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh | 3 +-- nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh | 1 - nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh | 2 +- nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index bdd8cb33e..5ac6bfa62 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,7 +1,5 @@ -### 26.0.0-7_updater (31-03-2023) - ⚠ WARNING : PLEASE BACKUP NEXTCLOUD & MARIADB ADDONS BEFORE UPDATING ! - ⚠ WARNING : Enables by default updater ; you can disable it with the option "disable_updates" -- Minor bugs fixed - Improved updater code - Autocorrection of permission errors in data directory diff --git a/nextcloud/config.json b/nextcloud/config.json index 782e186d9..2774b4c2f 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -106,6 +106,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "26.0.0-7_updater", + "version": "26.0.0-8_updater", "webui": "https://[HOST]:[PORT:443]" } \ No newline at end of file diff --git a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh index 6dcf93690..733d422c5 100755 --- a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh +++ b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh @@ -35,8 +35,7 @@ fi # Specify launcher PUID=$(bashio::config "PUID") -PGID=$(bashio::config "PGID") -LAUNCHER="sudo -u \#"$PUID" php /data/config/www/nextcloud/occ" +LAUNCHER="sudo -u \#$PUID php /data/config/www/nextcloud/occ" # Inform if new version available function nextcloud_download { diff --git a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh index a7e8795d1..2f856b565 100755 --- a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh +++ b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh @@ -6,7 +6,6 @@ if [ -f /notinstalled ]; then exit 0; fi # Specify launcher PUID=$(bashio::config "PUID") -PGID=$(bashio::config "PGID") # Check current version if [ -f /data/config/www/nextcloud/version.php ]; then diff --git a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh index 1f2e04866..0994502c0 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh @@ -8,7 +8,7 @@ if [ -f /notinstalled ]; then exit 0; fi # Specify launcher PUID=$(bashio::config "PUID") PGID=$(bashio::config "PGID") -LAUNCHER="sudo -u \#"$PUID" php /data/config/www/nextcloud/occ" +LAUNCHER="sudo -u \#$PUID php /data/config/www/nextcloud/occ" if $LAUNCHER fulltextsearch:test &>/dev/null; then echo "Full Text Search is already working" diff --git a/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh b/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh index 0750cf0a3..419aa7ed8 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh @@ -6,8 +6,7 @@ if [ -f /notinstalled ]; then exit 0; fi # Specify launcher PUID=$(bashio::config "PUID") -PGID=$(bashio::config "PGID") -LAUNCHER="sudo -u \#"$PUID" php /data/config/www/nextcloud/occ" +LAUNCHER="sudo -u \#$PUID php /data/config/www/nextcloud/occ" #################### # Initialization #