From 509206cd23af2e5c54229664a1fe7911ae437775 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Wed, 15 Nov 2017 19:48:49 +0100 Subject: ncp-web: only show wizard button if it exists, delete from docker --- docker-armhf/debian-ncp/run-parts.sh | 7 +++++-- docker-armhf/nextcloudpi/Dockerfile | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'docker-armhf') diff --git a/docker-armhf/debian-ncp/run-parts.sh b/docker-armhf/debian-ncp/run-parts.sh index 44336060..0c8fe3f1 100755 --- a/docker-armhf/debian-ncp/run-parts.sh +++ b/docker-armhf/debian-ncp/run-parts.sh @@ -25,8 +25,11 @@ test -f $FILE || { exit 0 } -rm -f /etc/services-enabled.d/$( basename $FILE ) -echo "disabled $1" +[[ "$2" == "disable" ]] && { + rm -f /etc/services-enabled.d/$( basename $FILE ) + echo "disabled $1" + exit 0 +} EOF chmod +x /usr/local/sbin/update-rc.d diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile index 7458eebf..7d7d21cd 100644 --- a/docker-armhf/nextcloudpi/Dockerfile +++ b/docker-armhf/nextcloudpi/Dockerfile @@ -24,6 +24,9 @@ sed -i 's|/media/USBdrive|/data/backups|' nextcloudpi-config.d/nc-backup.sh; \ # specific cleanup rm /usr/local/etc/nextcloudpi.sh; \ +# remove wizard for now +rm -r /var/www/ncp-web/wizard; \ + # letsencrypt build artifacts cleanup apt-get purge -y \ make \ -- cgit v1.2.3