From 9176473b2df5dc892afc31159380f51e8d239c8f Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Mon, 14 Aug 2017 11:27:28 +0200
Subject: [PATCH] nc-database: fail gracefully if mv fails

---
 etc/nextcloudpi-config.d/nc-database.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/nextcloudpi-config.d/nc-database.sh b/etc/nextcloudpi-config.d/nc-database.sh
index a4b550cf5..14a472460 100644
--- a/etc/nextcloudpi-config.d/nc-database.sh
+++ b/etc/nextcloudpi-config.d/nc-database.sh
@@ -62,8 +62,8 @@ configure()
 
   echo "moving database to $DBDIR_..."
   service mysql stop
-  mv $SRCDIR "$DBDIR_" || return 1
-  sed -i "s|^datadir.*|datadir = $DBDIR_|" /etc/mysql/mariadb.conf.d/50-server.cnf
+  mv $SRCDIR "$DBDIR_" && \
+    sed -i "s|^datadir.*|datadir = $DBDIR_|" /etc/mysql/mariadb.conf.d/50-server.cnf
   service mysql start 
 
   sudo -u www-data php occ maintenance:mode --off