only show "press any key" if not canceled

nextcloud · May 26, 2017 · 7196f17 · 7196f17
1 parent 88de2c6
commit 7196f17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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"