diff options
| author | nachoparker <nacho@ownyourbits.com> | 2017-11-15 21:48:49 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2017-11-15 22:23:07 +0300 |
| commit | 509206cd23af2e5c54229664a1fe7911ae437775 (patch) | |
| tree | 82877e6ede904593ac19eb166caa730325809e70 | |
| parent | cd2e94714426e6109ed8400ef7380d106af684a3 (diff) | |
ncp-web: only show wizard button if it exists, delete from dockerv0.34.11
| -rw-r--r-- | changelog.md | 4 | ||||
| -rwxr-xr-x | docker-armhf/debian-ncp/run-parts.sh | 7 | ||||
| -rw-r--r-- | docker-armhf/nextcloudpi/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/nextcloudpi/Dockerfile | 3 | ||||
| -rw-r--r-- | ncp-web/index.php | 7 |
5 files changed, 20 insertions, 4 deletions
diff --git a/changelog.md b/changelog.md index c01796a5..f335f980 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v0.34.10](https://github.com/nextcloud/nextcloudpi/commit/de8b961) (2017-11-14) noip: fix return value +[v0.34.11](https://github.com/nextcloud/nextcloudpi/commit/9b6a598) (2017-11-15) ncp-web: only show wizard button if it exists + +[v0.34.10](https://github.com/nextcloud/nextcloudpi/commit/de9eea5) (2017-11-14) noip: fix return value [v0.34.9 ](https://github.com/nextcloud/nextcloudpi/commit/e0dec54) (2017-11-12) nc-nextcloud: restart php after redis 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 \ diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index b0f9a57f..add24736 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/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 \ diff --git a/ncp-web/index.php b/ncp-web/index.php index b3263ee7..238b73d3 100644 --- a/ncp-web/index.php +++ b/ncp-web/index.php @@ -57,7 +57,7 @@ </div> <?php - if ( !file_exists( 'wizard.cfg' ) ) + if ( file_exists( 'wizard') && !file_exists( 'wizard.cfg' ) ) { echo <<<HTML <div id="first-run-wizard"> @@ -92,11 +92,16 @@ HTML; </a> </div> <div id="header-right"> +<?php + if ( file_exists( 'wizard' ) ) + echo <<<HTML <div class="wizard-btn"> <div id="expand"> <div class="icon-wizard-white"></div> </div> </div> +HTML; +?> <div id="poweroff"> <div id="expand"> <div class="icon-power-white"></div> |