git hidden directory is now backed up and restored properly

diff --git a/SOURCE/CORE/core-backup.sh b/SOURCE/CORE/core-backup.sh
index 58a1279a7bb568274d3ce29c8f290eeea0539e66..25f67c9199f875d339b2c85be1f922c381228a8c 100644 (file)
--- 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"

diff --git a/SOURCE/head.sh b/SOURCE/head.sh
index 9617ad395e5b10907a90c1d627162e6783a3f54e..d609726835fd6e2bf27dfc73b3f370a68a6c2789 100644 (file)
--- a/SOURCE/head.sh
+++ b/SOURCE/head.sh
@@ -138,6 +138,9 @@ jq executable:              ${JQ}
                "version": "${VERSION}",
                "dbversion": "${DBVERSION}"
        },
+       "git": {
+               "lastpull": ""
+       },
        "notes": []
 }
 __EOL__

diff --git a/notes.sh b/notes.sh
index cbb34eb5bd987b686e2810f6b84b91ee066a6238..0e56189a93d3b70c2582e01a4cf4e13df24f0efc 100755 (executable)
--- a/notes.sh
+++ b/notes.sh
@@ -138,6 +138,9 @@ jq executable:              ${JQ}
                "version": "${VERSION}",
                "dbversion": "${DBVERSION}"
        },
+       "git": {
+               "lastpull": ""
+       },
        "notes": []
 }
 __EOL__
@@ -320,9 +323,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 
@@ -365,6 +368,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"