Change 'Other' to 'Custom', add explanation to whiptail. Convert spac…

…es to tabs.
rosskevin · Feb 20, 2016 · 7001edc · 7001edc
1 parent b41608d
commit 7001edc
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
@@ -304,13 +304,13 @@ setStaticIPv4() {
 }
 
 setDNS(){
-	DNSChoseCmd=(whiptail --separate-output --radiolist "Select Upstream DNS Provider" $r $c 6)
+	DNSChoseCmd=(whiptail --separate-output --radiolist "Select Upstream DNS Provider. To use your own, select Custom" $r $c 6)
 	DNSChooseOptions=(Google "" on
 					  OpenDNS "" off
 					  Level3 "" off
 					  Norton "" off
 					  Comodo "" off
-					  Other "" off)
+					  Custom "" off)
 	DNSchoices=$("${DNSChoseCmd[@]}" "${DNSChooseOptions[@]}" 2>&1 >/dev/tty)
 	if [[ $? = 0 ]];then
 		case $DNSchoices in
@@ -339,10 +339,10 @@ setDNS(){
 				piholeDNS1="8.26.56.26"
 				piholeDNS2="8.20.247.20"
 				;;
-            Other)
-                until [[ $DNSSettingsCorrect = True ]]
-                do
-                    piholeDNS=$(whiptail --backtitle "Specify Upstream DNS Provider(s)"  --inputbox "Enter your desired upstream DNS provider(s)" $r $c "8.8.8.8, 8.8.4.4" 3>&1 1>&2 2>&3)
+			Custom)
+				until [[ $DNSSettingsCorrect = True ]]
+				do
+					piholeDNS=$(whiptail --backtitle "Specify Upstream DNS Provider(s)"  --inputbox "Enter your desired upstream DNS provider(s)" $r $c "8.8.8.8, 8.8.4.4" 3>&1 1>&2 2>&3)
 					if [[ $? = 0 ]];then
 						piholeDNS1=$(echo $piholeDNS | sed 's/[, \t]\+/,/g' | awk -F, '{print$1}')
 						piholeDNS2=$(echo $piholeDNS | sed 's/[, \t]\+/,/g' | awk -F, '{print$2}')
@@ -351,14 +351,14 @@ setDNS(){
 						exit 1
 					fi
 
-                    if (whiptail --backtitle "Specify Upstream DNS Provider(s)" --title "Upstream DNS Provider(s)" --yesno "Are these settings correct?\n    DNS Server 1:   $piholeDNS1\n    DNS Server 2:   $piholeDNS2" $r $c) then
+					if (whiptail --backtitle "Specify Upstream DNS Provider(s)" --title "Upstream DNS Provider(s)" --yesno "Are these settings correct?\n    DNS Server 1:   $piholeDNS1\n    DNS Server 2:   $piholeDNS2" $r $c) then
 							DNSSettingsCorrect=True
 					else
 						# If the settings are wrong, the loop continues
 						DNSSettingsCorrect=False
 					fi
-                done
-                ;;
+				done
+				;;
 		esac
 	else
 		echo "::: Cancel selected. Exiting..."