Consistency

Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner.

advanced/Scripts/update.sh

@@ -18,12 +18,12 @@ piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
 piholeFilesDir="/etc/.pihole"
 
 spinner() {
-	local pid=$1
+	local pid=${1}
 	local delay=0.50
 	local spinstr='/-\|'
-    while [ "$(ps a | awk '{print $1}' | grep "$pid")" ]; do
+	while [ "$(ps a | awk '{print $1}' | grep "${pid}")" ]; do
 		local temp=${spinstr#?}
-        printf " [%c]  " "$spinstr"
+		printf " [%c]  " "${spinstr}"
 		local spinstr=${temp}${spinstr%"$temp"}
 		sleep ${delay}
 		printf "\b\b\b\b\b\b"
@@ -59,7 +59,7 @@ make_repo() {
 }
 
 update_repo() {
-    # Pull the latest commits
+# Pull the latest commits
 	echo -n ":::     Updating repo in $1..."
 	cd "${1}" || exit 1
 	git stash -q > /dev/null & spinner $!
@@ -117,7 +117,6 @@ elif [[ ${piholeVersion} == ${piholeVersionLatest} && ${webVersion} != ${webVers
 	echo "::: Web Admin version is now at ${webVersion}"
 	echo "::: If you had made any changes in '/var/www/html/admin', they have been stashed using 'git stash'"
 	echo ""
-
 elif [[ ${piholeVersion} != ${piholeVersionLatest} && ${webVersion} == ${webVersionLatest} ]]; then
 	echo "::: Pi-hole core files out of date"
 	getGitFiles ${piholeFilesDir} ${piholeGitUrl}
@@ -127,7 +126,6 @@ elif [[ ${piholeVersion} != ${piholeVersionLatest} && ${webVersion} == ${webVers
 	echo "::: Pi-hole version is now at ${piholeVersion}"
 	echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
 	echo ""
-
 elif [[ ${piholeVersion} != ${piholeVersionLatest} && ${webVersion} != ${webVersionLatest} ]]; then
 	echo "::: Updating Everything"
 	getGitFiles ${piholeFilesDir} ${piholeGitUrl}

advanced/Scripts/version.sh

@@ -21,14 +21,13 @@ normalOutput() {
 	piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 	webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 
-    echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
-    echo "::: Web-Admin version is $webVersion (Latest version is $webVersionLatest)"
+	echo "::: Pi-hole version is ${piholeVersion} (Latest version is ${piholeVersionLatest})"
+	echo "::: Web-Admin version is ${webVersion} (Latest version is ${webVersionLatest})"
 }
 
 webOutput() {
-    for var in "$@"
-    do
-      case "$var" in
+	for var in "$@"; do
+		case "${var}" in
 			"-l" | "--latest"    ) latest=true;;
 			"-c" | "--current"   ) current=true;;
 			*                    ) echo "::: Invalid Option!"; exit 1;
@@ -49,9 +48,8 @@ webOutput() {
 }
 
 coreOutput() {
- for var in "$@"
-    do
-      case "$var" in
+	for var in "$@"; do
+		case "${var}" in
 			"-l" | "--latest"    ) latest=true;;
 			"-c" | "--current"   ) current=true;;
 			*                    ) echo "::: Invalid Option!"; exit 1;
@@ -93,9 +91,8 @@ if [[ $# = 0 ]]; then
 	normalOutput
 fi
 
-for var in "$@"
-do
-  case "$var" in
+for var in "$@"; do
+	case "${var}" in
 	"-a" | "--admin"     ) shift; webOutput "$@";;
 	"-p" | "--pihole"    ) shift; coreOutput "$@" ;;
 	"-h" | "--help"      ) helpFunc;;