From 2f56c02f76ef2b016388bcbcf4f69f4180cad04c Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 7 Jul 2020 15:51:48 -0500 Subject: [PATCH 1/5] ` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b4afc6..b6695bc 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Assuming Gravity Sync runs successfully, it will indicate if there are changes p The default command for Gravity Sync is simple. ``` -./gravity-sync.sh` +./gravity-sync.sh ``` But you can also run `./gravity-sync.sh smart` if you feel like it, and it'll do the same thing. From d46b2f5a9a59453959b0622f3e6a52c79b038fa7 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Wed, 8 Jul 2020 09:32:20 -0500 Subject: [PATCH 2/5] " --- gravity-sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 689171a..44f72aa 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS # GRAVITY SYNC BY VMSTAN ##################### 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') # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync @@ -1469,7 +1469,7 @@ function clear_cron { echo_stat 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 error_validate rm cronjob-old.tmp From aecca3e7f09d6ee6f63bda655ea32092887ac33b Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Wed, 8 Jul 2020 09:33:25 -0500 Subject: [PATCH 3/5] 2.0.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b6695bc..29ab571 100644 --- a/README.md +++ b/README.md @@ -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. -### Smart Sync +### The Smart Sync The default command for Gravity Sync is simple. From ea8f196669210fada2524e73ce69e63ed4cc958b Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Wed, 8 Jul 2020 09:34:18 -0500 Subject: [PATCH 4/5] 2.0.1 --- ADVANCED.md | 4 ++-- VERSION | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ADVANCED.md b/ADVANCED.md index 92a825d..7a52bb1 100644 --- a/ADVANCED.md +++ b/ADVANCED.md @@ -14,8 +14,8 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync ```bash cd ~ -wget https://github.com/vmstan/gravity-sync/archive/v2.0.0.zip -unzip v2.0.0.zip -d gravity-sync +wget https://github.com/vmstan/gravity-sync/archive/v2.0.1.zip +unzip v2.0.1.zip -d gravity-sync cd gravity-sync ``` diff --git a/VERSION b/VERSION index 359a5b9..10bf840 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 \ No newline at end of file +2.0.1 \ No newline at end of file From 6626ec93a0d3ce53c1062b0b5349471d5c25dcc6 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Wed, 8 Jul 2020 09:35:31 -0500 Subject: [PATCH 5/5] 2.0.1 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99c86fc..20b3c1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. +#### 2.0.1 +- Fixes bug that caused existing crontab entry not to be removed when switching from `pull` to Smart Sync. + ## 1.8 ### The Logical Release