diff options
| author | nachoparker <nacho@ownyourbits.com> | 2017-11-17 11:48:51 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2017-11-18 17:00:38 +0300 |
| commit | bccbb5ba6cd7557aa2f9c476cc1b84e82f2a1486 (patch) | |
| tree | 5235d8565ed4ec63ed905562604b60feee90a040 | |
| parent | 75fe8d485f2a4502f1158bd917f7ab7faccb69b7 (diff) | |
nc-datadir: make backup if non emptyv0.35.1
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-datadir.sh | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/changelog.md b/changelog.md index 1781fbd3..c759aa26 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v0.35.0](https://github.com/nextcloud/nextcloudpi/commit/bd698e5) (2017-11-17) added nc-passwd +[v0.35.1](https://github.com/nextcloud/nextcloudpi/commit/c3195c6) (2017-11-17) nc-datadir: make backup if non empty + +[v0.35.0 ](https://github.com/nextcloud/nextcloudpi/commit/05dd8e3) (2017-11-17) added nc-passwd [v0.34.16](https://github.com/nextcloud/nextcloudpi/commit/d3bade5) (2017-11-17) nc-datadir: refuse to move to SD card diff --git a/etc/nextcloudpi-config.d/nc-datadir.sh b/etc/nextcloudpi-config.d/nc-datadir.sh index b1cc782b..7283f7ae 100644 --- a/etc/nextcloudpi-config.d/nc-datadir.sh +++ b/etc/nextcloudpi-config.d/nc-datadir.sh @@ -37,12 +37,16 @@ configure() } [ -d "$SRCDIR" ] || { echo -e "data directory $SRCDIR not found"; return 1; } + [[ "$SRCDIR" == "$DATADIR_" ]] && { echo -e "INFO: data already there"; return 0; } + + # check datadir empty [ -d $DATADIR_ ] && { [[ $( find "$DATADIR_" -maxdepth 0 -empty | wc -l ) == 0 ]] && { - echo "$DATADIR_ is not empty" - return 1 + local BKP="${DATADIR_}-$( date "+%m-%d-%y" )" + echo "INFO: $DATADIR_ is not empty. Creating backup $BKP" + mv "$DATADIR_" "$BKP" } - rmdir "$DATADIR_" + rm -rf "$DATADIR_" } local BASEDIR=$( dirname "$DATADIR_" ) |