diff options
| author | danix <danix@danix.xyz> | 2023-04-13 16:16:45 +0200 |
|---|---|---|
| committer | danix <danix@danix.xyz> | 2023-04-13 16:16:45 +0200 |
| commit | 87a368fe55efdd2cba599e07f29786a3ad745310 (patch) | |
| tree | 2d76d11955700e837c2e4d3bcf9b0b80621270ab | |
| parent | 4cbcb39e2007338c1c6ec17376c14b841ce6f733 (diff) | |
| download | bash-notes-87a368fe55efdd2cba599e07f29786a3ad745310.tar.gz bash-notes-87a368fe55efdd2cba599e07f29786a3ad745310.zip | |
git hidden directory is now backed up and restored properly
| -rw-r--r-- | SOURCE/CORE/core-backup.sh | 11 | ||||
| -rw-r--r-- | SOURCE/head.sh | 3 | ||||
| -rwxr-xr-x | notes.sh | 14 |
3 files changed, 24 insertions, 4 deletions
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" diff --git a/SOURCE/head.sh b/SOURCE/head.sh index 9617ad3..d609726 100644 --- a/SOURCE/head.sh +++ b/SOURCE/head.sh @@ -138,6 +138,9 @@ jq executable: ${JQ} "version": "${VERSION}", "dbversion": "${DBVERSION}" }, + "git": { + "lastpull": "" + }, "notes": [] } __EOL__ @@ -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" |