From 3eb90f5ca9cb3ca2b646f8e0ac12823226e430ea Mon Sep 17 00:00:00 2001
From: Michael Gamlem III <mgamlem3@gmail.com>
Date: Mon, 25 Jul 2022 16:26:08 -0700
Subject: [PATCH 1/5] Add missing semicolons

---
 pihole-cloudsync | 57 ++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/pihole-cloudsync b/pihole-cloudsync
index ec24aec..b18a2a2 100755
--- a/pihole-cloudsync
+++ b/pihole-cloudsync
@@ -67,8 +67,8 @@ DB_DUMP_FILE="db_dump.sql"
 
 # Force sudo if not running with root privileges
 SUDO=''
-if [ "$EUID" -ne 0 ]; then
-    SUDO='sudo'
+if [ "$EUID" -ne 0 ];
+  then SUDO='sudo'
 fi
 
 # Attempt to detect pihole running in Docker
@@ -217,40 +217,44 @@ pull () {
 }
 ###########################################################################
 # Check to see whether a command line option was provided
-if [ -z "$1" ]; then
-        echo "Missing command line option. Try --push, --pull, or --help."
-        exit 1
+if [ -z "$1" ];
+  then
+    echo "Missing command line option. Try --push, --pull, or --help."
+    exit 1
 fi
 # Determine which action to perform (InitPush, InitPull, Push, Pull, or Help)
 for arg in "$@"; do
     # Initialize - adds primary Pi-hole's lists to local Git repo before first push/upload
-    if [ "$arg" == "--initpush" ]; then
-        echo "$arg option detected. Initializing local Git repo for Push/Upload.";
-        push_initialize
-        exit 0
+    if [ "$arg" == "--initpush" ];
+    then
+	echo "$arg option detected. Initializing local Git repo for Push/Upload.";
+	push_initialize
+	exit 0
     # Initialize - adds primary Pi-hole's lists to local Git repo before first push/upload
-    elif [ "$arg" == "--initpull" ]; then
-        echo "$arg option detected. Initializing local Git repo for Pull/Download.";
-        shift
-        [ -n "$1" ] && git_branch="$1"
-        pull_initialize
-        exit 0
+    elif [ "$arg" == "--initpull" ];
+    then
+	echo "$arg option detected. Initializing local Git repo for Pull/Download.";
+	pull_initialize
+	exit 0
     # Push / Upload - Pushes updated local Pi-hole lists to remote Git repo
-    elif [ "$arg" == "--push" ] || [ "$arg" == "--upload" ] || [ "$arg" == "--up" ] || [ "$arg" == "-u" ]; then
-        echo "$arg option detected. Running in Push/Upload mode."
-        push
-        exit 0
+    elif [ "$arg" == "--push" ] || [ "$arg" == "--upload" ] || [ "$arg" == "--up" ] || [ "$arg" == "-u" ];
+    then
+	echo "$arg option detected. Running in Push/Upload mode."
+	push
+	exit 0
     # Pull / Download - Pulls updated Pi-hole lists from remote Git repo
-    elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ]; then
+    elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ];
+    then
         echo "$arg option detected. Running in Pull/Download mode."
         shift
         [ -n "$1" ] && git_branch="$1"
         pull
         exit 0
     # Help - Displays help dialog
-    elif [ "$arg" == "--help" ] || [ "$arg" == "-h" ] || [ "$arg" == "-?" ]; then
-        cat <<- EOF
-        Usage: pihole-cloudsync <option>
+    elif [ "$arg" == "--help" ] || [ "$arg" == "-h" ] || [ "$arg" == "-?" ];
+    then
+	cat << EOF
+Usage: pihole-cloudsync <option>
 
         Options:
             --push, --upload, --up, -u               Push (upload) your Pi-hole lists to a remote Git repo
@@ -269,9 +273,10 @@ for arg in "$@"; do
 EOF
 
     # Version - Displays version number
-    elif [ "$arg" == "--version" ] || [ "$arg" == "-v" ]; then
-        echo 'pihole-cloudsync v'$version' - Updated '"$update";
-        echo 'https://github.com/stevejenkins/pihole-cloudsync';
+    elif [ "$arg" == "--version" ] || [ "$arg" == "-v" ];
+	then
+	echo 'pihole-cloudsync v'$version' - Updated '"$update";
+	echo 'https://github.com/stevejenkins/pihole-cloudsync';
 
     # Invalid command line option was passed
     else

From 311dd9ab9db0a383c171f69244b86ea43a5a422d Mon Sep 17 00:00:00 2001
From: Michael Gamlem III <mgamlem3@gmail.com>
Date: Mon, 25 Jul 2022 16:28:38 -0700
Subject: [PATCH 2/5] Only modify domainlist if the domainlist.csv has content
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was causing some strange errors when I was running it. Plus if there is no content to add from git, the table doesn’t need to be modified.
---
 pihole-cloudsync | 52 +++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/pihole-cloudsync b/pihole-cloudsync
index b18a2a2..34e53a1 100755
--- a/pihole-cloudsync
+++ b/pihole-cloudsync
@@ -148,8 +148,13 @@ pull_initialize () {
     $SUDO cp $custom_list $pihole_dir
     $SUDO cp $cname_list $dnsmasq_dir
 
-    # Overwrite local database tables
-    import_tables
+	# Overwrite local database tables
+	$SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
+	$SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
+	if [ -s domainlist.csv ]; then
+		$SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"
+		$SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
+	fi
 
     # Restart Pi-hole to pick up changes
     $SUDO ${DOCKER} pihole -g
@@ -195,25 +200,30 @@ pull () {
     # Go to Pi-hole directory, exit if doesn't exist
     cd $personal_git_dir || exit
 
-    # Update local Git repo from remote Git repo
-    $SUDO git remote update > /dev/null
-    CHANGED=$($SUDO git log HEAD..origin/${git_branch} --oneline)
-    if [ -n "${CHANGED}" ]; then
-        echo 'Remote Git repo is different than local Pi-hole lists. Updating local lists...';
-        # Remove -q option if you don't want to run in "quiet" mode
-        $SUDO git fetch --all -q
-        $SUDO git reset --hard "origin/${git_branch}" -q
-        $SUDO ${DOCKER} service pihole-FTL stop
-        $SUDO cp $custom_list $pihole_dir
-        $SUDO cp $cname_list $dnsmasq_dir
-        import_tables
-        $SUDO ${DOCKER} pihole -g
-        echo 'Done!';
-        exit 0
-    else
-        echo 'Local Pi-hole lists match remote Git repo. No further action required.';
-        exit 0
-    fi
+	# Update local Git repo from remote Git repo
+	$SUDO git remote update > /dev/null
+	CHANGED=$($SUDO git log HEAD..origin/master --oneline)
+	if [ -n "${CHANGED}" ]; then
+                echo 'Remote Git repo is different than local Pi-hole lists. Updating local lists...';
+                # Remove -q option if you don't want to run in "quiet" mode
+                $SUDO git fetch --all -q
+		$SUDO git reset --hard origin/master -q
+                $SUDO service pihole-FTL stop
+                $SUDO cp $custom_list $pihole_dir
+                $SUDO cp $cname_list $dnsmasq_dir
+                $SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
+                $SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
+                if [ -s domainlist.csv ]; then
+                    $SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"
+                    $SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
+                fi
+		$SUDO pihole -g
+                echo 'Done!';
+                exit 0
+        else
+                echo 'Local Pi-hole lists match remote Git repo. No further action required.';
+                exit 0
+        fi
 }
 ###########################################################################
 # Check to see whether a command line option was provided

From 7752d6dd4894dacd253927195e8853709267ba8a Mon Sep 17 00:00:00 2001
From: Michael Gamlem III <mgamlem3@gmail.com>
Date: Mon, 25 Jul 2022 16:30:23 -0700
Subject: [PATCH 3/5] Use DELETE instead of DROP when modifying tables

See: https://github.com/stevejenkins/pihole-cloudsync/issues/40#issuecomment-1194760079
---
 pihole-cloudsync | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pihole-cloudsync b/pihole-cloudsync
index 34e53a1..eefe785 100755
--- a/pihole-cloudsync
+++ b/pihole-cloudsync
@@ -149,10 +149,10 @@ pull_initialize () {
     $SUDO cp $cname_list $dnsmasq_dir
 
 	# Overwrite local database tables
-	$SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
+	$SUDO sqlite3 $gravity_db "DELETE FROM adlist;"
 	$SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
 	if [ -s domainlist.csv ]; then
-		$SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"
+		$SUDO sqlite3 $gravity_db "DELETE FROM domainlist;"
 		$SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
 	fi
 
@@ -211,10 +211,10 @@ pull () {
                 $SUDO service pihole-FTL stop
                 $SUDO cp $custom_list $pihole_dir
                 $SUDO cp $cname_list $dnsmasq_dir
-                $SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
+                $SUDO sqlite3 $gravity_db "DELETE FROM adlist;"
                 $SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
                 if [ -s domainlist.csv ]; then
-                    $SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"
+                    $SUDO sqlite3 $gravity_db "DELETE FROM domainlist;"
                     $SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
                 fi
 		$SUDO pihole -g

From 1b87267d9377243b37ac4cb3d6bfe15dfb38092e Mon Sep 17 00:00:00 2001
From: Michael Gamlem III <mgamlem3@gmail.com>
Date: Mon, 25 Jul 2022 16:31:55 -0700
Subject: [PATCH 4/5] Skip first row when importing from csv

The first row of the csv file should be the column names and should be ignored.
---
 pihole-cloudsync | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pihole-cloudsync b/pihole-cloudsync
index eefe785..658a17b 100755
--- a/pihole-cloudsync
+++ b/pihole-cloudsync
@@ -150,10 +150,10 @@ pull_initialize () {
 
 	# Overwrite local database tables
 	$SUDO sqlite3 $gravity_db "DELETE FROM adlist;"
-	$SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
+	$SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 adlist.csv adlist"
 	if [ -s domainlist.csv ]; then
 		$SUDO sqlite3 $gravity_db "DELETE FROM domainlist;"
-		$SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
+		$SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 domainlist.csv domainlist"
 	fi
 
     # Restart Pi-hole to pick up changes
@@ -212,10 +212,10 @@ pull () {
                 $SUDO cp $custom_list $pihole_dir
                 $SUDO cp $cname_list $dnsmasq_dir
                 $SUDO sqlite3 $gravity_db "DELETE FROM adlist;"
-                $SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
+                $SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 adlist.csv adlist"
                 if [ -s domainlist.csv ]; then
                     $SUDO sqlite3 $gravity_db "DELETE FROM domainlist;"
-                    $SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
+                    $SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 domainlist.csv domainlist"
                 fi
 		$SUDO pihole -g
                 echo 'Done!';

From e33ec811e6601e36ee2c56b0eddc2a34aa54186d Mon Sep 17 00:00:00 2001
From: Michael Gamlem III <mgamlem3@gmail.com>
Date: Tue, 21 Nov 2023 17:11:13 -0800
Subject: [PATCH 5/5] Remove tab whitespace

---
 pihole-cloudsync | 52 ++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/pihole-cloudsync b/pihole-cloudsync
index 658a17b..1343791 100755
--- a/pihole-cloudsync
+++ b/pihole-cloudsync
@@ -148,13 +148,13 @@ pull_initialize () {
     $SUDO cp $custom_list $pihole_dir
     $SUDO cp $cname_list $dnsmasq_dir
 
-	# Overwrite local database tables
-	$SUDO sqlite3 $gravity_db "DELETE FROM adlist;"
-	$SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 adlist.csv adlist"
-	if [ -s domainlist.csv ]; then
-		$SUDO sqlite3 $gravity_db "DELETE FROM domainlist;"
-		$SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 domainlist.csv domainlist"
-	fi
+    # Overwrite local database tables
+    $SUDO sqlite3 $gravity_db "DELETE FROM adlist;"
+    $SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 adlist.csv adlist"
+    if [ -s domainlist.csv ]; then
+        $SUDO sqlite3 $gravity_db "DELETE FROM domainlist;"
+        $SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 domainlist.csv domainlist"
+    fi
 
     # Restart Pi-hole to pick up changes
     $SUDO ${DOCKER} pihole -g
@@ -200,14 +200,14 @@ pull () {
     # Go to Pi-hole directory, exit if doesn't exist
     cd $personal_git_dir || exit
 
-	# Update local Git repo from remote Git repo
-	$SUDO git remote update > /dev/null
-	CHANGED=$($SUDO git log HEAD..origin/master --oneline)
-	if [ -n "${CHANGED}" ]; then
+    # Update local Git repo from remote Git repo
+    $SUDO git remote update > /dev/null
+    CHANGED=$($SUDO git log HEAD..origin/master --oneline)
+    if [ -n "${CHANGED}" ]; then
                 echo 'Remote Git repo is different than local Pi-hole lists. Updating local lists...';
                 # Remove -q option if you don't want to run in "quiet" mode
                 $SUDO git fetch --all -q
-		$SUDO git reset --hard origin/master -q
+        $SUDO git reset --hard origin/master -q
                 $SUDO service pihole-FTL stop
                 $SUDO cp $custom_list $pihole_dir
                 $SUDO cp $cname_list $dnsmasq_dir
@@ -217,7 +217,7 @@ pull () {
                     $SUDO sqlite3 $gravity_db "DELETE FROM domainlist;"
                     $SUDO sqlite3 $gravity_db -header -csv ".import --skip 1 domainlist.csv domainlist"
                 fi
-		$SUDO pihole -g
+        $SUDO pihole -g
                 echo 'Done!';
                 exit 0
         else
@@ -237,21 +237,21 @@ for arg in "$@"; do
     # Initialize - adds primary Pi-hole's lists to local Git repo before first push/upload
     if [ "$arg" == "--initpush" ];
     then
-	echo "$arg option detected. Initializing local Git repo for Push/Upload.";
-	push_initialize
-	exit 0
+    echo "$arg option detected. Initializing local Git repo for Push/Upload.";
+    push_initialize
+    exit 0
     # Initialize - adds primary Pi-hole's lists to local Git repo before first push/upload
     elif [ "$arg" == "--initpull" ];
     then
-	echo "$arg option detected. Initializing local Git repo for Pull/Download.";
-	pull_initialize
-	exit 0
+    echo "$arg option detected. Initializing local Git repo for Pull/Download.";
+    pull_initialize
+    exit 0
     # Push / Upload - Pushes updated local Pi-hole lists to remote Git repo
     elif [ "$arg" == "--push" ] || [ "$arg" == "--upload" ] || [ "$arg" == "--up" ] || [ "$arg" == "-u" ];
     then
-	echo "$arg option detected. Running in Push/Upload mode."
-	push
-	exit 0
+    echo "$arg option detected. Running in Push/Upload mode."
+    push
+    exit 0
     # Pull / Download - Pulls updated Pi-hole lists from remote Git repo
     elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ];
     then
@@ -263,7 +263,7 @@ for arg in "$@"; do
     # Help - Displays help dialog
     elif [ "$arg" == "--help" ] || [ "$arg" == "-h" ] || [ "$arg" == "-?" ];
     then
-	cat << EOF
+    cat << EOF
 Usage: pihole-cloudsync <option>
 
         Options:
@@ -284,9 +284,9 @@ EOF
 
     # Version - Displays version number
     elif [ "$arg" == "--version" ] || [ "$arg" == "-v" ];
-	then
-	echo 'pihole-cloudsync v'$version' - Updated '"$update";
-	echo 'https://github.com/stevejenkins/pihole-cloudsync';
+    then
+    echo 'pihole-cloudsync v'$version' - Updated '"$update";
+    echo 'https://github.com/stevejenkins/pihole-cloudsync';
 
     # Invalid command line option was passed
     else