Skip to content

Commit

Permalink
press key after going back to menu ncp-config
Browse files Browse the repository at this point in the history
  • Loading branch information
nachoparker committed May 25, 2017
1 parent c8ee570 commit 59c981b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions bin/nextcloudpi-config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions etc/nextcloudpi-config.d/nc-database.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions etc/nextcloudpi-config.d/nc-datadir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 59c981b

Please sign in to comment.