From 6c0a8a43377bc24994e50cc2c6c6b7c6956a088c Mon Sep 17 00:00:00 2001
From: "Daniel (Fourdee)" <daniel_haze@hotmail.com>
Date: Thu, 25 Aug 2016 12:11:54 +0100
Subject: [PATCH 1/2] Minor - Corrected var names

Kilobyte values are used, not Bytes.
---
 automated install/basic-install.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 0ed95976..415251e3 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -158,27 +158,27 @@ verifyFreeDiskSpace() {
 
 	# 50MB is the minimum space needed (45MB install (includes web admin bootstrap/jquery libraries etc) + 5MB one day of logs.)
 	# - Fourdee: Local ensures the variable is only created, and accessible within this function/void. Generally considered a "good" coding practice for non-global variables.
-	local requiredFreeBytes=51200
-	local existingFreeBytes=$(df -Pk | grep -m1 '\/$' | awk '{print $4}')
+	local required_free_kilobytes=51200
+	local existing_free_kilobytes=$(df -Pk | grep -m1 '\/$' | awk '{print $4}')
 
 	# - Unknown free disk space , not a integer
-	if ! [[ "$existingFreeBytes" =~ ^([0-9])+$ ]]; then
+	if ! [[ "$existing_free_kilobytes" =~ ^([0-9])+$ ]]; then
 
 		whiptail --title "Unknown free disk space" --yesno "We were unable to determine available free disk space on this system.\n\nYou may override this check and force the installation, however, it is not recommended.\n\nWould you like to continue with the installation?" --defaultno --backtitle "Pi-hole" $r $c
 		local choice=$?
 		if (( $choice != 0 )); then
 
-			echo "non-integer value from existingFreeBytes ($existingFreeBytes)"
+			echo "non-integer value from existing_free_kilobytes ($existing_free_kilobytes)"
 			echo "Unknown free space, user aborted, exiting..."
 			exit 1
 
 		fi
 
 	# - Insufficient free disk space
-	elif [[ $existingFreeBytes -lt $requiredFreeBytes ]]; then
+	elif [[ $existing_free_kilobytes -lt $required_free_kilobytes ]]; then
 
-		whiptail --msgbox --backtitle "Insufficient Disk Space" --title "Insufficient Disk Space" "\nYour system appears to be low on disk space. pi-hole recomends a minimum of $requiredFreeBytes Bytes.\nYou only have $existingFreeBytes Free.\n\nIf this is a new install you may need to expand your disk.\n\nTry running:\n    'sudo raspi-config'\nChoose the 'expand file system option'\n\nAfter rebooting, run this installation again.\n\ncurl -L install.pi-hole.net | bash\n" $r $c
-		echo "$existingFreeBytes is less than $requiredFreeBytes"
+		whiptail --msgbox --backtitle "Insufficient Disk Space" --title "Insufficient Disk Space" "\nYour system appears to be low on disk space. pi-hole recomends a minimum of $required_free_kilobytes Bytes.\nYou only have $existing_free_kilobytes Free.\n\nIf this is a new install you may need to expand your disk.\n\nTry running:\n    'sudo raspi-config'\nChoose the 'expand file system option'\n\nAfter rebooting, run this installation again.\n\ncurl -L install.pi-hole.net | bash\n" $r $c
+		echo "$existing_free_kilobytes is less than $required_free_kilobytes"
 		echo "Insufficient free space, exiting..."
 		exit 1
 

From 49ded54306523b571b0c58bba9e968310f61f78f Mon Sep 17 00:00:00 2001
From: "Daniel (Fourdee)" <daniel_haze@hotmail.com>
Date: Thu, 25 Aug 2016 12:17:36 +0100
Subject: [PATCH 2/2] Minor - Update descriptions

Apply to whiptail descriptions also.
---
 automated install/basic-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 415251e3..614ff291 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -177,7 +177,7 @@ verifyFreeDiskSpace() {
 	# - Insufficient free disk space
 	elif [[ $existing_free_kilobytes -lt $required_free_kilobytes ]]; then
 
-		whiptail --msgbox --backtitle "Insufficient Disk Space" --title "Insufficient Disk Space" "\nYour system appears to be low on disk space. pi-hole recomends a minimum of $required_free_kilobytes Bytes.\nYou only have $existing_free_kilobytes Free.\n\nIf this is a new install you may need to expand your disk.\n\nTry running:\n    'sudo raspi-config'\nChoose the 'expand file system option'\n\nAfter rebooting, run this installation again.\n\ncurl -L install.pi-hole.net | bash\n" $r $c
+		whiptail --msgbox --backtitle "Insufficient Disk Space" --title "Insufficient Disk Space" "\nYour system appears to be low on disk space. pi-hole recomends a minimum of $required_free_kilobytes KiloBytes.\nYou only have $existing_free_kilobytes KiloBytes free.\n\nIf this is a new install you may need to expand your disk.\n\nTry running:\n    'sudo raspi-config'\nChoose the 'expand file system option'\n\nAfter rebooting, run this installation again.\n\ncurl -L install.pi-hole.net | bash\n" $r $c
 		echo "$existing_free_kilobytes is less than $required_free_kilobytes"
 		echo "Insufficient free space, exiting..."
 		exit 1