diff options
author | nachoparker <nacho@ownyourbits.com> | 2017-05-26 17:18:46 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2017-05-26 18:58:17 +0300 |
commit | f0df477ac712136c9905804417b5161ac4ac10ef (patch) | |
tree | 739f5d40ef93987ebcd6154f0145da37f092b5fe | |
parent | a78d5ddf86b7963a316090fb867f10fed303782e (diff) |
only show "press any key" if not canceledv0.12.7
-rwxr-xr-x | bin/nextcloudpi-config | 4 | ||||
-rwxr-xr-x | etc/library.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/bin/nextcloudpi-config b/bin/nextcloudpi-config index 96edbd09..477724c1 100755 --- a/bin/nextcloudpi-config +++ b/bin/nextcloudpi-config @@ -58,9 +58,7 @@ function nextcloud-config() # launch selected script info_script $script.sh || continue; - configure_script $script.sh - echo "Press any key..." - read + configure_script $script.sh && { echo "Done. Press any key..."; read; } done return } # force to read the whole thing into memory, as its contents might change in update.sh diff --git a/etc/library.sh b/etc/library.sh index c594d68f..ebba330b 100755 --- a/etc/library.sh +++ b/etc/library.sh @@ -230,7 +230,7 @@ function configure_script() ( local SCRIPT=$1 cd /usr/local/etc/nextcloudpi-config.d/ - config $SCRIPT || return 0 # writes "$INSTALLATION_CODE" + config $SCRIPT || return 1 # writes "$INSTALLATION_CODE" echo -e "$INSTALLATION_CODE" > $SCRIPT # save configuration source ./$SCRIPT # load configuration echo -e "Launching \e[1m$( basename $SCRIPT .sh )\e[0m" |