From b1312e043f004e3c58d5d8bf7003abb5ec3d85a1 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mstanclift@vmware.com>
Date: Sat, 11 Jul 2020 08:53:45 -0500
Subject: [PATCH] 2.1.1 (#57)

* 2.1.1

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
---
 ADVANCED.md     |  4 ++--
 CHANGELOG.md    |  5 ++++-
 VERSION         |  2 +-
 gravity-sync.sh | 16 +++++++++++-----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ADVANCED.md b/ADVANCED.md
index 318f5a6..edf8fab 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.1.0.zip
-unzip v2.1.0.zip -d gravity-sync
+wget https://github.com/vmstan/gravity-sync/archive/v2.1.1.zip
+unzip v2.1.1.zip -d gravity-sync
 cd gravity-sync
 ```
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 750e6a7..aeaa724 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,10 @@ It's suggested to make sure your local restore was successful before completing
 
 Support for the the Dropbear SSH client/server (which was added in 1.7.6) will be removed in an upcoming version of Gravity Sync. If you are using this instead of OpenSSH (common with DietPi) please reconfigure your installation to use OpenSSH. You will want to delete your existing `~/.ssh/id_rsa` and `~/.ssh/id_rsa.pub` files and run `./gravity-sync.sh configure` again to generate a new key and copy it to the primary Pi-hole.
 
-The `./gravity-sync.sh update` and `version` functions will look for the `dbclient` binary on the local system and warn users to change.
+The `./gravity-sync.sh update` and `version` functions will look for the `dbclient` binary on the local system and warn users about the upcoming changes.
+
+#### 2.1.1
+- Last release was incorrectly published without logic to ignore `custom.list` if request or not used. 
 
 ## 2.0
 ### The Smart Release
diff --git a/VERSION b/VERSION
index 50aea0e..7c32728 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
\ No newline at end of file
+2.1.1
\ No newline at end of file
diff --git a/gravity-sync.sh b/gravity-sync.sh
index 4cf0328..5e6d141 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.1.0'
+VERSION='2.1.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
@@ -1701,11 +1701,17 @@ function task_backup {
 	sqlite3 ${PIHOLE_DIR}/${GRAVITY_FI} ".backup '$HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup'"
 		error_validate
 
-	MESSAGE="Performing Backup Up ${CUSTOM_DNS}"
-	echo_stat
+	if [ "$SKIP_CUSTOM" != '1' ]
+	then	
+		if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
+		then
+			MESSAGE="Performing Backup Up ${CUSTOM_DNS}"
+			echo_stat
 
-	cp ${PIHOLE_DIR}/${CUSTOM_DNS} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup
-		error_validate
+			cp ${PIHOLE_DIR}/${CUSTOM_DNS} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup
+			error_validate
+		fi
+	fi
 
 	MESSAGE="Cleaning Up Old Backups"
 	echo_stat