From a1ccfe850c3690f0ac8531faf6f9221eb6819090 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 4 Jul 2018 15:27:40 +0200
Subject: [PATCH] Adapted the script to run more stable

---
 README.md |  2 +-
 incl.sh   |  0
 main.sh   | 11 ++++++-----
 run.sh    | 22 ++++++++++++++--------
 4 files changed, 21 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 incl.sh
 mode change 100755 => 100644 main.sh
 mode change 100755 => 100644 run.sh

diff --git a/README.md b/README.md
index 617cf19..d94543c 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The Bash scripts used to backup database and folders on a server
 Clone Repository
 
 ```bash
-   $ git clone ssh://git@projects.vdm.io/system-backup.git system-backup
+   $ git clone ssh://git@github.com:vdm-io/Backup-System.git system-backup
 ```
 
 Rename __config.txt__ to __config.sh__ and update the values in the file.
diff --git a/incl.sh b/incl.sh
old mode 100755
new mode 100644
diff --git a/main.sh b/main.sh
old mode 100755
new mode 100644
index 1dbeb9f..cba2ad9
--- a/main.sh
+++ b/main.sh
@@ -22,7 +22,7 @@
 ### MAIN ###
 function main () {
 	# backup the databases now
-	backupDB
+	backupDB &
 	# backup the websites now
 	backupWEB
 }
@@ -36,12 +36,13 @@ function backupDB () {
 		DBFILE=$(zipDB "${database[0]}" "${database[1]}" "${database[2]}" "${database[3]}" "${database[4]}")
 		# move to backup server
 		moveDB "$DBFILE"
-		# now remove the local file
-		rmTmpFolder "$tmpFolder"
 	done < $databaseBuilder
 	
+	# now remove the local file
+	rmTmpFolder "$tmpFolder"
+
 	# start fresh
-	cd "$DIR"
+	cd "$USERHOME"
 	# GO To remote server and do house cleaning
 	ssh -tt -p '22' "$REMOTESSH" "$(typeset -f); remoteHouseCleaning $REMOTEDBPATH"
 }
@@ -57,7 +58,7 @@ function backupWEB () {
 	done < $folderBuilder
 	
 	# start fresh
-	cd "$DIR"
+	cd "$USERHOME"
 	# GO To remote server and do house cleaning
 	ssh -tt -p '22' "$REMOTESSH" "$(typeset -f); remoteHouseCleaning $REMOTEWEBPATH"
 }
diff --git a/run.sh b/run.sh
old mode 100755
new mode 100644
index 2dd66e1..3b663f4
--- a/run.sh
+++ b/run.sh
@@ -19,6 +19,8 @@
 #
 #/-----------------------------------------------------------------------------------------------------------------------------/
 
+# user home dir
+USERHOME=~/
 # get script path
 DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" || "$DIR" == '.' ]]; then DIR="$PWD"; fi
@@ -29,14 +31,15 @@ if [[ ! -d "$DIR" || "$DIR" == '.' ]]; then DIR="$PWD"; fi
 # load functions
 . "$DIR/incl.sh"
 
-# we move out of the script folder
+# got to script folder
 cd "$DIR"
-cd ../
+# set Base Dir
+BASEDIR="$PWD"
 
 # get random folder name to avoid conflict
 newFolder=$(getRandom)
 # set this repo location
-tmpFolder="$PWD/T3MPR3P0_$newFolder"
+tmpFolder="$USERHOME/T3MPR3P0_$newFolder"
 # create tmp folder
 if [ ! -d "$tmpFolder" ] 
 then
@@ -45,23 +48,26 @@ fi
 
 # DB file
 databasesFileName="databases"
-databaseBuilder="$DIR/$databasesFileName"
+databaseBuilder="$BASEDIR/$databasesFileName"
 # check if file exist
 if [ ! -f "$databaseBuilder" ] 
 then
-    echo 'No databases.txt found'
+    echo 'No databases filefound'
     exit 1
 fi
 
 # folder names
 foldersFileName="folders"
-folderBuilder="$DIR/$foldersFileName"
+folderBuilder="$BASEDIR/$foldersFileName"
 # check if file exist
 if [ ! -f "$folderBuilder" ] 
 then
-    echo 'No folders.txt found'
+    echo 'No folders folder found'
     exit 1
 fi
 
+# we move to user folder
+cd "$USERHOME"
+
 # run main
-. "$DIR/main.sh"
+. "$BASEDIR/main.sh"