From 0f8a42836592052ee5bfbe46e04a182819988b80 Mon Sep 17 00:00:00 2001
From: Joel Goguen <jgoguen@users.noreply.github.com>
Date: Sun, 26 Sep 2021 09:16:58 -0700
Subject: [PATCH] Normalize indentation and style

---
 pihole-cloudsync | 191 ++++++++++++++++++++++-------------------------
 1 file changed, 90 insertions(+), 101 deletions(-)

diff --git a/pihole-cloudsync b/pihole-cloudsync
index efbaf02..6de8a0b 100755
--- a/pihole-cloudsync
+++ b/pihole-cloudsync
@@ -18,12 +18,12 @@ update='December 26, 2020'
 # USAGE: pihole-cloudsync <option>
 
 # OPTIONS:
-#  --initpush				Initialize Primary Pi-hole in "Push" mode
-#  --initpull				Initialize Secondary Pi-hole in "Pull" mode
-#  --push, --upload, --up, -u		Push (upload) your Pi-hole lists to a remote Git repo
-#  --pull, --download, --down, -d	Pull (download) your lists from a remote Git repo
-#  --help, -h, -?			Show the current version of pihole-cloudsync
-#  --version, -v			Show version number
+#  --initpush        Initialize Primary Pi-hole in "Push" mode
+#  --initpull        Initialize Secondary Pi-hole in "Pull" mode
+#  --push, --upload, --up, -u    Push (upload) your Pi-hole lists to a remote Git repo
+#  --pull, --download, --down, -d  Pull (download) your lists from a remote Git repo
+#  --help, -h, -?      Show the current version of pihole-cloudsync
+#  --version, -v      Show version number
 
 # EXAMPLES:
 #  'pihole-cloudsync --push' will push (upload) your lists to a remote Git repo
@@ -45,21 +45,18 @@ cname_list='05-pihole-custom-cname.conf'
 
 # 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
 DOCKER=''
 DOCKER_CMD="$(command -v docker)"
 JQ_CMD="$(command -v jq)"
-if [ -n "${DOCKER_CMD}" ]
-then
+if [ -n "${DOCKER_CMD}" ]; then
 	CONTAINER="$(${DOCKER_CMD} ps -f "ancestor=pihole/pihole" --format "{{.Names}}")"
-	if [ -n "${CONTAINER}" ]
-	then
-		if [ -n "${JQ_CMD}" ]
-		then
+	if [ -n "${CONTAINER}" ]; then
+		if [ -n "${JQ_CMD}" ]; then
 			echo "Found pihole running under Docker container '${CONTAINER}'"
 
 			pihole_dir="$(${DOCKER_CMD} inspect -f "{{json .Mounts}}" "${CONTAINER}" | ${JQ_CMD} -r --arg dir "${pihole_dir}" '.[] | select(.Destination==$dir) | .Source')"
@@ -135,127 +132,119 @@ push () {
 	 # Go to Pi-hole directory, exit if doesn't exist
 	cd $pihole_dir || exit
 
-        # Copy local Custom and CNAME lists to local Git repo
-        $SUDO cp $custom_list $personal_git_dir
-        $SUDO cp $dnsmasq_dir/$cname_list $personal_git_dir
+	# Copy local Custom and CNAME lists to local Git repo
+	$SUDO cp $custom_list $personal_git_dir
+	$SUDO cp $dnsmasq_dir/$cname_list $personal_git_dir
 
 	# Go to local Git repo directory
-        cd $personal_git_dir || exit
+	cd $personal_git_dir || exit
 
-        # Export Ad and Domain lists from Gravity database
-        $SUDO sqlite3 $gravity_db -header -csv "SELECT * FROM adlist" >$ad_list
-        $SUDO sqlite3 $gravity_db -header -csv "SELECT * FROM domainlist" >$domain_list
+	# Export Ad and Domain lists from Gravity database
+	$SUDO sqlite3 $gravity_db -header -csv "SELECT * FROM adlist" >$ad_list
+	$SUDO sqlite3 $gravity_db -header -csv "SELECT * FROM domainlist" >$domain_list
 
 	# Compare local files to remote Git repo
 	$SUDO git remote update > /dev/null
 
 	# If local files are different than remote, update remote Git repo
-        CHANGED=$($SUDO git --work-tree=$personal_git_dir status --porcelain)
-        if [ -n "${CHANGED}" ]; then
-                echo 'Local Pi-hole lists are different than remote Git repo. Updating remote repo...';
+	CHANGED=$($SUDO git --work-tree=$personal_git_dir status --porcelain)
+	if [ -n "${CHANGED}" ]; then
+		echo 'Local Pi-hole lists are different than remote Git repo. Updating remote repo...';
 		rightnow=$(date +"%B %e, %Y %l:%M%p")
 		# Remove -q option if you don't want to run in "quiet" mode
 		$SUDO git commit -a -m "Updated $rightnow" -q
 		$SUDO git push -q
 		echo 'Done!';
 		exit 0
-        else
-	# If local files are the same as remote, do nothing and exit
-	echo 'Remote Git repo matches local Pi-hole lists. No further action required.';
+	else
+		# If local files are the same as remote, do nothing and exit
+		echo 'Remote Git repo matches local Pi-hole lists. No further action required.';
 		exit 0
-        fi
+	fi
 }
 pull () {
-        # Go to Pi-hole directory, exit if doesn't exist
+	# 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
-                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
+		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 ${DOCKER} 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"
-                $SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"
-                $SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
+		$SUDO ${DOCKER} 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"
+		$SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"
+		$SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
 		$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
+		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
-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
-    # 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
-    # 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
-    # Pull / Download - Pulls updated Pi-hole lists from remote Git repo
-    elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ]
-    then
-        echo "$arg option detected. Running in Pull/Download mode."
-	pull
-        exit 0
-    # Help - Displays help dialog
-    elif [ "$arg" == "--help" ] || [ "$arg" == "-h" ] || [ "$arg" == "-?" ]
-    then
-	cat << EOF
-Usage: pihole-cloudsync <option>
+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
+	# 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
+	# 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
+	# Pull / Download - Pulls updated Pi-hole lists from remote Git repo
+	elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ]; then
+		echo "$arg option detected. Running in Pull/Download mode."
+		pull
+		exit 0
+	# Help - Displays help dialog
+	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
-  --pull, --download, --down, -d	Pull (download) your lists from a remote Git repo
-  --initpush				Initialize Primary Pi-hole in "Push" mode
-  --initpull				Initialize Secondary Pi-hole in "Pull" mode
-  --help, -h, -?			Show this help dialog
-  --version, -v				Show the current version of pihole-cloudsync
+		Options:
+			--push, --upload, --up, -u    Push (upload) your Pi-hole lists to a remote Git repo
+			--pull, --download, --down, -d  Pull (download) your lists from a remote Git repo
+			--initpush        Initialize Primary Pi-hole in "Push" mode
+			--initpull        Initialize Secondary Pi-hole in "Pull" mode
+			--help, -h, -?      Show this help dialog
+			--version, -v        Show the current version of pihole-cloudsync
 
-Examples:
-  'pihole-cloudsync --push' will push (upload) your lists to a Git repo
-  'pihole-cloudsync --pull' will pull (download) your lists from a Git repo
+		Examples:
+			'pihole-cloudsync --push' will push (upload) your lists to a Git repo
+			'pihole-cloudsync --pull' will pull (download) your lists from a Git repo
 
-Project Home: https://github.com/stevejenkins/pihole-cloudsync
+		Project Home: https://github.com/stevejenkins/pihole-cloudsync
 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';
+	# Version - Displays version number
+	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
-	echo "Invalid command line option. Try --push, --pull, or --help."
-	exit 1
-    fi
+	# Invalid command line option was passed
+	else
+		echo "Invalid command line option. Try --push, --pull, or --help."
+		exit 1
+	fi
 done