X-Git-Url: https://git.danix.xyz/?p=bash-notes.git;a=blobdiff_plain;f=SOURCE%2FCORE%2Fcore-backup.sh;h=25f67c9199f875d339b2c85be1f922c381228a8c;hp=58a1279a7bb568274d3ce29c8f290eeea0539e66;hb=87a368fe55efdd2cba599e07f29786a3ad745310;hpb=4cbcb39e2007338c1c6ec17376c14b841ce6f733

diff --git a/SOURCE/CORE/core-backup.sh b/SOURCE/CORE/core-backup.sh
index 58a1279..25f67c9 100644
--- a/SOURCE/CORE/core-backup.sh
+++ b/SOURCE/CORE/core-backup.sh
@@ -26,9 +26,9 @@ function backup_data() {
     fi
     # ok, we have a backup directory
     if [ -r $RCFILE ]; then
-    	BCKUP_COMM=$(rsync -avz --progress ${RCFILE}* ${BASEDIR}/* ${BACKUPDIR})
+    	BCKUP_COMM=$(rsync -avz --progress ${RCFILE}* ${BASEDIR}/ ${BACKUPDIR})
     else
-    	BCKUP_COMM=$(rsync -avz --progress ${BASEDIR}/* ${BACKUPDIR})
+    	BCKUP_COMM=$(rsync -avz --progress ${BASEDIR}/ ${BACKUPDIR})
     fi
     # run the command
     if [ "$BCKUP_COMM" ]; then	
@@ -71,6 +71,13 @@ function backup_restore() {
 				fi
 				cp --verbose ${BACKUPDIR}/${BACKUPDB} $DB
 			fi
+			# restoring git repo subdirectory
+			if [ -d $BACKUPDIR/.git ]; then
+				if [ /bin/ls -A ${BASEDIR}/.git ]; then
+					rm -rf ${BASEDIR}/.git
+				fi
+				cp -r --verbose ${BACKUPDIR}/.git ${BASEDIR}/
+			fi
 			;;
 		* )
 			echo "No changes made. Exiting"