Merge pull request #51 from vmstan/development

2.0.1
This commit is contained in:
Michael Stanclift 2020-07-08 09:36:21 -05:00 committed by GitHub
commit 78027aeea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 6 deletions

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.0.0.zip wget https://github.com/vmstan/gravity-sync/archive/v2.0.1.zip
unzip v2.0.0.zip -d gravity-sync unzip v2.0.1.zip -d gravity-sync
cd gravity-sync cd gravity-sync
``` ```

View File

@ -13,6 +13,9 @@ This allows you to be more flexible in where you make your configuration changes
New installs will use the `smart` function by default. Existing users who want to use this new method as their standard should run `./gravity-sync.sh automate` function to replace the existing automated `pull` with the new Smart Sync. This is not required. The previous `./gravity-sync.sh pull` and `./gravity-sync.sh push` commands continue to function as they did previously, with no intention to break this functionality. New installs will use the `smart` function by default. Existing users who want to use this new method as their standard should run `./gravity-sync.sh automate` function to replace the existing automated `pull` with the new Smart Sync. This is not required. The previous `./gravity-sync.sh pull` and `./gravity-sync.sh push` commands continue to function as they did previously, with no intention to break this functionality.
#### 2.0.1
- Fixes bug that caused existing crontab entry not to be removed when switching from `pull` to Smart Sync.
## 1.8 ## 1.8
### The Logical Release ### The Logical Release

View File

@ -59,7 +59,7 @@ Now, test Gravity Sync. You can run a comparison between primary and secondary d
Assuming Gravity Sync runs successfully, it will indicate if there are changes pending between the two databases. If not, make a subtle change to a whitelist/blacklist on your primary Pi-hole, such as changing a description field or disabling a whitelist item, and then running `./gravity-sync.sh compare` again to validate your installation is working correctly. Assuming Gravity Sync runs successfully, it will indicate if there are changes pending between the two databases. If not, make a subtle change to a whitelist/blacklist on your primary Pi-hole, such as changing a description field or disabling a whitelist item, and then running `./gravity-sync.sh compare` again to validate your installation is working correctly.
### Smart Sync ### The Smart Sync
The default command for Gravity Sync is simple. The default command for Gravity Sync is simple.

View File

@ -1 +1 @@
2.0.0 2.0.1

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.0.0' VERSION='2.0.1'
# 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
@ -1469,7 +1469,7 @@ function clear_cron {
echo_stat echo_stat
crontab -l > cronjob-old.tmp crontab -l > cronjob-old.tmp
sed '/${GS_FILENAME}/d' cronjob-old.tmp > cronjob-new.tmp sed "/${GS_FILENAME}/d" cronjob-old.tmp > cronjob-new.tmp
crontab cronjob-new.tmp 2>/dev/null crontab cronjob-new.tmp 2>/dev/null
error_validate error_validate
rm cronjob-old.tmp rm cronjob-old.tmp