diff --git a/library.sh b/library.sh index 23e3a371..34e6201a 100755 --- a/library.sh +++ b/library.sh @@ -223,7 +223,9 @@ function pack_image() local IMGOUT="$1" local IMGNAME="$2" local TARNAME=$( basename $IMGNAME .img ).tar.bz2 - cp -v "$IMGOUT" "$IMGNAME" || return 1 + echo "copying $IMGNAME → $TARNAME" + cp "$IMGOUT" "$IMGNAME" || return 1 + echo "packing $IMGNAME → $TARNAME" tar -I pbzip2 -cvf $TARNAME "$IMGNAME" &>/dev/null && \ echo -e "$TARNAME packed successfully" } diff --git a/nc-datadir.sh b/nc-datadir.sh index 5a3c70f3..dd17901f 100755 --- a/nc-datadir.sh +++ b/nc-datadir.sh @@ -16,10 +16,13 @@ # DATADIR_=/media/USBdrive/ncdata -DESCRIPTION="Change your data dir location" +DESCRIPTION="Change your data dir to a new location, like a USB drive" configure() { + local SRCDIR=$( cd /var/www/nextcloud; sudo -u www-data php occ config:system:get datadirectory ) + [ -d $SRCDIR ] || { echo -e "data directory $SRCDIR not found"; return 1; } + [ -d $DATADIR_ ] && { [[ $( find "$DATADIR_" -maxdepth 0 -empty | wc -l ) == 0 ]] && { echo "$DATADIR_ is not empty" @@ -28,15 +31,15 @@ configure() rmdir "$DATADIR_" } - service apache2 stop - local BASEDIR=$( dirname "$DATADIR_" ) mkdir -p "$BASEDIR" [[ $( 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" - cp -ra /var/www/nextcloud/data/ "$DATADIR_" || return 1 + service apache2 stop + + cp -ra "$SRCDIR" "$DATADIR_" || return 1 cd /var/www/nextcloud sudo -u www-data php occ config:system:set datadirectory --value=$DATADIR_ diff --git a/nextcloudpi-config b/nextcloudpi-config index da387ad9..453b7de8 100755 --- a/nextcloudpi-config +++ b/nextcloudpi-config @@ -1,7 +1,7 @@ #!/bin/bash # NextCloudPi software configuration -# Tested with 2017-01-11-raspbian-jessie.img (and lite) +# Tested with 2017-03-02-raspbian-jessie-lite.img # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk!