From 338da330f4ce312a4d1fc44beaf9ababe2863888 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sat, 26 Jan 2019 12:49:22 -0700
Subject: ncp-update-nc: fix unnecessary quotes

---
 bin/ncp-update-nc | 4 ++--
 changelog.md      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc
index 8d5c8149..944b80dc 100755
--- a/bin/ncp-update-nc
+++ b/bin/ncp-update-nc
@@ -23,7 +23,7 @@ VER="$1"
 
 # pre-checks
 ####################
-[[ -f /.docker-image ]] && BASEDIR=/data || BASEDIR=/var/www/
+[[ -f /.docker-image ]] && BASEDIR=/data || BASEDIR=/var/www
 cd "$BASEDIR"
 DATADIR="$( grep datadirectory nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 )"
 [[ -d /var/www/nextcloud-old ]] && { echo "Nextcloud backup directory found. Interrupted installation?"; exit 1; }
@@ -145,7 +145,7 @@ done
 
 # copy data if it was at the default location
 ####################
-[[ "$DATADIR" == ""$BASEDIR"/nextcloud/data" ]] && {
+[[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && {
   echo "Restore data..."
   mv -T nextcloud-old/data nextcloud/data
 }
diff --git a/changelog.md b/changelog.md
index 63be8ad8..8f7644d8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
 
-[v1.4.7](https://github.com/nextcloud/nextcloudpi/commit/5d6dd2e) (2019-01-25) ncp-config: fix local variables
+[v1.4.8](https://github.com/nextcloud/nextcloudpi/commit/ea9a1ea) (2019-01-26) ncp-update-nc: fix unnecessary quotes
 
-[v1.4.6](https://github.com/nextcloud/nextcloudpi/commit/b338ede) (2019-01-24) ncp-config: fix missing variable
+[v1.4.7](https://github.com/nextcloud/nextcloudpi/commit/ffc1fa5) (2019-01-25) ncp-config: fix local variables
+
+[v1.4.6  ](https://github.com/nextcloud/nextcloudpi/commit/b338ede) (2019-01-24) ncp-config: fix missing variable
 
 [v1.4.5  ](https://github.com/nextcloud/nextcloudpi/commit/b7efa7a) (2019-01-22) armbian: fix cron permissions bug (2)
 
-- 
cgit v1.2.3