Mirrored_Repos/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2024-08-30 18:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

breakup into functions

Browse Source
This commit is contained in:
Michael Stanclift 2020-07-11 14:42:52 -05:00
parent 39aea0d602
commit e14588add5
4 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ADVANCED.md
View File

@ -14,8 +14,8 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync
```bash ```bash
cd ~ cd ~
wget https://github.com/vmstan/gravity-sync/archive/v2.1.2.zip wget https://github.com/vmstan/gravity-sync/archive/v2.1.5.zip
unzip v2.1.2.zip -d gravity-sync unzip v2.1.5.zip -d gravity-sync
cd gravity-sync cd gravity-sync
``` ```

3
CHANGELOG.md
View File

@ -25,6 +25,9 @@ The `./gravity-sync.sh update` and `version` functions will look for the `dbclie
#### 2.1.2 #### 2.1.2
- Corrects a bug in `backup` automation that causes the backup to run every minute during the hour selected. - Corrects a bug in `backup` automation that causes the backup to run every minute during the hour selected.
#### 2.1.5
Skipping a few digits because what does it really matter?
## 2.0 ## 2.0
### The Smart Release ### The Smart Release

2
VERSION
View File

@ -1 +1 @@
2.1.2 2.1.5

33
gravity-sync.sh
View File

@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS
# GRAVITY SYNC BY VMSTAN ##################### # GRAVITY SYNC BY VMSTAN #####################
PROGRAM='Gravity Sync' PROGRAM='Gravity Sync'
VERSION='2.1.2' VERSION='2.1.5'
# Execute from the home folder of the user who owns it (ex: 'cd ~/gravity-sync') # Execute from the home folder of the user who owns it (ex: 'cd ~/gravity-sync')
# For documentation or downloading updates visit https://github.com/vmstan/gravity-sync # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync
@ -141,10 +141,13 @@ function update_gs {
# Gravity Core Functions # Gravity Core Functions
## Pull Gravity ## Pull Gravity
function pull_gs_grav { function pull_gs_grav {
MESSAGE="Backing Up ${GRAVITY_FI} on $HOSTNAME"
echo_stat backup_local_gravity
cp ${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.backup >/dev/null 2>&1
error_validate # MESSAGE="Backing Up ${GRAVITY_FI} on $HOSTNAME"
# echo_stat
# cp ${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.backup >/dev/null 2>&1
# error_validate
MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}"
echo_stat echo_stat
@ -291,6 +294,7 @@ function pull_gs_reload {
function pull_gs { function pull_gs {
md5_compare md5_compare
backup_settime
pull_gs_grav pull_gs_grav
pull_gs_cust pull_gs_cust
pull_gs_reload pull_gs_reload
@ -1693,14 +1697,27 @@ function task_backup {
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
BACKUPTIMESTAMP=$(date +%F-%H%M%S) backup_settime
backup_local_gravity
backup_local_custom
backup_cleanup
exit_withchange
}
function backup_settime {
BACKUPTIMESTAMP=$(date +%F-%H%M%S)
}
function backup_local_gravity {
MESSAGE="Performing Backup of ${GRAVITY_FI}" MESSAGE="Performing Backup of ${GRAVITY_FI}"
echo_stat echo_stat
sqlite3 ${PIHOLE_DIR}/${GRAVITY_FI} ".backup '$HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup'" sqlite3 ${PIHOLE_DIR}/${GRAVITY_FI} ".backup '$HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup'"
error_validate error_validate
}
function backup_local_custom {
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ] if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
@ -1712,14 +1729,14 @@ function task_backup {
error_validate error_validate
fi fi
fi fi
}
function backup_cleanup {
MESSAGE="Cleaning Up Old Backups" MESSAGE="Cleaning Up Old Backups"
echo_stat echo_stat
find $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/$(date +%Y)*.backup -mtime +${BACKUP_RETAIN} -type f -delete find $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/$(date +%Y)*.backup -mtime +${BACKUP_RETAIN} -type f -delete
error_validate error_validate
exit_withchange
} }
# Echo Stack # Echo Stack