diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-09-29 17:24:03 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-09-29 18:00:03 +0300 |
| commit | 6b14527ab4572008bbf3a243c5d1494ad18c7c54 (patch) | |
| tree | ab4d5a5a432eef47820271fabdf8ffba256e5b62 | |
| parent | aa2b3baa913373f3a324ac7dca1e747333a21997 (diff) | |
build: make sure we dont deactivate the wizard accidentally
| -rwxr-xr-x | batch.sh | 29 | ||||
| -rwxr-xr-x | build-SD-armbian.sh | 1 | ||||
| -rwxr-xr-x | build-SD-rpi.sh | 3 | ||||
| -rw-r--r-- | docker-armhf/nextcloudpi/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/nextcloudpi/Dockerfile | 3 | ||||
| -rw-r--r-- | install.sh | 1 | ||||
| -rw-r--r-- | ncp-web/index.php | 5 |
7 files changed, 27 insertions, 18 deletions
@@ -31,21 +31,26 @@ IMG="$( ls -1t tmp/*.img | head -1 )" ./build-SD-armbian.sh bananapi Bananapi # Docker x86 -make nextcloudpi-x86 && { - docker push ownyourbits/nextcloudpi-x86 - docker push ownyourbits/nextcloud-x86 - docker push ownyourbits/lamp-x86 - docker push ownyourbits/debian-ncp-x86 -} +make nextcloudpi-x86 + +# TODO test first +#&& { + #docker push ownyourbits/nextcloudpi-x86 + #docker push ownyourbits/nextcloud-x86 + #docker push ownyourbits/lamp-x86 + #docker push ownyourbits/debian-ncp-x86 +#} # Docker armhf cp -n /usr/bin/qemu-arm-static docker-armhf && \ -make nextcloudpi-armhf && { - docker push ownyourbits/nextcloudpi-armhf - docker push ownyourbits/nextcloud-armhf - docker push ownyourbits/lamp-armhf - docker push ownyourbits/debian-ncp-armhf -} +make nextcloudpi-armhf + +# TODO test first && { + #docker push ownyourbits/nextcloudpi-armhf + #docker push ownyourbits/nextcloud-armhf + #docker push ownyourbits/lamp-armhf + #docker push ownyourbits/debian-ncp-armhf +#} rm -f docker-armhf/qemu-arm-static # License diff --git a/build-SD-armbian.sh b/build-SD-armbian.sh index 1f0c3680..c668f15a 100755 --- a/build-SD-armbian.sh +++ b/build-SD-armbian.sh @@ -26,6 +26,7 @@ prepare_dirs # tmp cache output # add NCP modifications mkdir -p armbian/userpatches armbian/userpatches/overlay +rm -f ncp-web/{wizard.cfg,ncp-web.cfg} cp armbian.sh armbian/userpatches/customize-image.sh rsync -Aax --delete --exclude-from .gitignore --exclude *.img --exclude *.bz2 . armbian/userpatches/overlay/ diff --git a/build-SD-rpi.sh b/build-SD-rpi.sh index 30494d4f..2ef40a15 100755 --- a/build-SD-rpi.sh +++ b/build-SD-rpi.sh @@ -27,6 +27,9 @@ download_raspbian "$IMG" resize_image "$IMG" "$SIZE" update_boot_uuid "$IMG" # PARTUUID has changed after resize +# make sure we don't accidentally disable first run wizard +rm -f ncp-web/{wizard.cfg,ncp-web.cfg} + ## BUILD NCP echo -e "\e[1m\n[ Build NCP ]\e[0m" diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile index 87bcdc92..2edfe5ce 100644 --- a/docker-armhf/nextcloudpi/Dockerfile +++ b/docker-armhf/nextcloudpi/Dockerfile @@ -15,6 +15,9 @@ COPY docker-common /tmp/ncp-build/docker-common/ RUN \ +# make sure we don't accidentally disable first run wizard +rm -f ncp-web/{wizard.cfg,ncp-web.cfg}; \ + # mark as image build touch /.ncp-image; \ diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index 8655cc22..ac4e539f 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -15,6 +15,9 @@ COPY docker-common /tmp/ncp-build/docker-common/ RUN \ +# make sure we don't accidentally disable first run wizard +rm -f ncp-web/{wizard.cfg,ncp-web.cfg}; \ + # mark as image build touch /.ncp-image; \ @@ -51,7 +51,6 @@ install_script etc/ncp-config.d/nc-nextcloud.sh activate_script etc/ncp-config.d/nc-nextcloud.sh install_script ncp.sh activate_script etc/ncp-config.d/nc-init.sh -[[ -f /.ncp-image ]] && install_script post-inst.sh popd echo "Done. diff --git a/ncp-web/index.php b/ncp-web/index.php index a55bd69f..4de840c6 100644 --- a/ncp-web/index.php +++ b/ncp-web/index.php @@ -148,9 +148,6 @@ HTML; <div class="icon-config"></div> </div> </div> -<?php - if ( file_exists( 'wizard' ) ) - echo <<<HTML <a href="wizard" title="{$l->__("NextCloudPi Wizard")}"> <div class="wizard-btn"> <div id="expand"> @@ -158,8 +155,6 @@ HTML; </div> </div> </a> -HTML; -?> <a href="https://github.com/nextcloud/nextcloudpi/wiki" target="_blank" tabindex="1" title="<?php echo $l->__("NextCloudPi Wiki"); ?>"> <div id="nc-button"> <div id="expand"> |