diff options
| author | nachoparker <nacho@ownyourbits.com> | 2017-05-25 10:13:52 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2017-05-25 19:20:34 +0300 |
| commit | 59c981be8a5500c5f1b0afb1d46e94fc65aabc84 (patch) | |
| tree | 98d411bc77fd95a6ace0990afb0e81adf9668bc7 | |
| parent | c8ee5706439ec007520163164ded2dcd26d42730 (diff) | |
press key after going back to menu ncp-configv0.12.4
| -rwxr-xr-x | bin/nextcloudpi-config | 2 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-database.sh | 4 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-datadir.sh | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/bin/nextcloudpi-config b/bin/nextcloudpi-config index 1b701a0c..96edbd09 100755 --- a/bin/nextcloudpi-config +++ b/bin/nextcloudpi-config @@ -59,6 +59,8 @@ function nextcloud-config() # launch selected script info_script $script.sh || continue; configure_script $script.sh + echo "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/nextcloudpi-config.d/nc-database.sh b/etc/nextcloudpi-config.d/nc-database.sh index d998eea2..0bde71fb 100644 --- a/etc/nextcloudpi-config.d/nc-database.sh +++ b/etc/nextcloudpi-config.d/nc-database.sh @@ -44,9 +44,9 @@ configure() local BASEDIR=$( dirname "$DBDIR_" ) mkdir -p "$BASEDIR" - grep -q ext <( stat -fc%T $BASEDIR ) || { echo -e "Only ext filesystems can hold the database"; sleep 3; return 1; } + grep -q ext <( stat -fc%T $BASEDIR ) || { echo -e "Only ext filesystems can hold the database"; return 1; } - sudo -u mysql test -x $BASEDIR || { echo -e "ERROR: the user mysql does not have access permissions over $BASEDIR"; sleep 3; return 1; } + sudo -u mysql test -x $BASEDIR || { echo -e "ERROR: the user mysql does not have access permissions over $BASEDIR"; return 1; } [[ $( stat -fc%d / ) == $( stat -fc%d $BASEDIR ) ]] && \ echo -e "INFO: moving database to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up" diff --git a/etc/nextcloudpi-config.d/nc-datadir.sh b/etc/nextcloudpi-config.d/nc-datadir.sh index fa8e8c88..94bbdf1c 100644 --- a/etc/nextcloudpi-config.d/nc-datadir.sh +++ b/etc/nextcloudpi-config.d/nc-datadir.sh @@ -44,9 +44,9 @@ configure() local BASEDIR=$( dirname "$DATADIR_" ) mkdir -p "$BASEDIR" - grep -q ext <( stat -fc%T $BASEDIR ) || { echo -e "Only ext filesystems can hold the data directory"; sleep 3; return 1; } + grep -q ext <( stat -fc%T $BASEDIR ) || { echo -e "Only ext filesystems can hold the data directory"; return 1; } - sudo -u www-data test -x $BASEDIR || { echo -e "ERROR: the user www-data does not have access permissions over $BASEDIR"; sleep 3; return 1; } + sudo -u www-data test -x $BASEDIR || { echo -e "ERROR: the user www-data does not have access permissions over $BASEDIR"; return 1; } [[ $( stat -fc%d / ) == $( stat -fc%d $BASEDIR ) ]] && \ echo -e "INFO: moving data dir to another place in the same SD card\nIf you want to use an external mount, make sure it is properly set up" |