[gentoo-commits] proj/livecd-tools:master commit in: /

["William Hubbs" <williamh@gentoo.org>]

commit:     82c72caf8633f7a7cb94befcc869f28c71077c73
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  7 17:22:33 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 22:44:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=82c72caf

net-setup: make dialog calls more readable

This splits the dialog calls onto multiple lines to make them more
readable.

---
 net-setup | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/net-setup b/net-setup
index 4216787..785631b 100755
--- a/net-setup
+++ b/net-setup
@@ -12,7 +12,8 @@ show_ifmenu() {
 	done
 	IFS="${old_ifs}"
 
-	if ! eval dialog --visit-items --menu "Please select the interface that you wish to configure from the list below:" 0 0 0 $opts 2>iface
+	if ! eval dialog --visit-items \
+		--menu "Please select the interface that you wish to configure from the list below:" 0 0 0 $opts 2>iface
 	then
 		exit
 	fi
@@ -34,7 +35,8 @@ show_ifconfirm() {
 	[[ -n ${if_bus} ]] && text="${text}Bus type: ${if_bus}\n"
 	text="${text}\nIs this the interface that you wish to configure?"
 
-	if ! dialog --visit-items --title "Interface details" --yesno "${text}" 15 70
+	if ! dialog --visit-items --title "Interface details" --yesno \
+		"${text}" 15 70
 	then
 		result="no"
 	else
@@ -44,19 +46,27 @@ show_ifconfirm() {
 
 config_wireless() {
 	cd /tmp/setup.opts
-	dialog --visit-items --title "SSID" --inputbox "Please enter your SSID, or leave blank for selecting the nearest open network" 20 50 2> ${iface}.SSID
+	dialog --visit-items --title "SSID" \
+		--inputbox "Please enter your SSID, or leave blank for selecting the nearest open network" \
+		20 50 2> ${iface}.SSID
 	SSID=$(tail -n 1 ${iface}.SSID)
 	if [ -n "${SSID}" ]
 	then
-		dialog --visit-items --title "WEP (Part 1)" --menu "Does your network use encryption?" 20 60 7 1 "Yes" 2 "No" 2> ${iface}.WEP
+		dialog --visit-items --title "WEP (Part 1)" \
+			--menu "Does your network use encryption?" \
+			20 60 7 1 "Yes" 2 "No" 2> ${iface}.WEP
 		WEP=$(tail -n 1 ${iface}.WEP)
 		case ${WEP} in
 			1)
-				dialog --visit-items --title "WEP (Part 2)" --menu "Are you entering your WEP key in HEX or ASCII?" 20 60 7 1 "HEX" 2 "ASCII" 2> ${iface}.WEPTYPE
+				dialog --visit-items --title "WEP (Part 2)" \
+					--menu "Are you entering your WEP key in HEX or ASCII?" \
+					20 60 7 1 "HEX" 2 "ASCII" 2> ${iface}.WEPTYPE
 				WEP_TYPE=$(tail -n 1 ${iface}.WEPTYPE)
 				case ${WEP_TYPE} in
 					1)
-						dialog --visit-items --title "WEP (Part 3)" --inputbox "Please enter your WEP key in the form of XXXX-XXXX-XX for 64-bit or XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XX for 128-bit" 20 50 2> ${iface}.WEPKEY
+						dialog --visit-items --title "WEP (Part 3)" \
+							--inputbox "Please enter your WEP key in the form of XXXX-XXXX-XX for 64-bit or XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XX for 128-bit" \
+							20 50 2> ${iface}.WEPKEY
 						WEP_KEY=$(tail -n 1 ${iface}.WEPKEY)
 						if [ -n "${WEP_KEY}" ]
 						then
@@ -65,7 +75,9 @@ config_wireless() {
 						fi
 					;;
 					2)
-						dialog --visit-items --title "WEP (Part 3)" --inputbox "Please enter your WEP key in ASCII form.  This should be 5 or 13 characters for either 64-bit or 128-bit encryption, repectively" 20 50 2> ${iface}.WEPKEY
+						dialog --visit-items --title "WEP (Part 3)" \
+							--inputbox "Please enter your WEP key in ASCII form.  This should be 5 or 13 characters for either 64-bit or 128-bit encryption, respectively" \
+							20 50 2> ${iface}.WEPKEY
 						WEP_KEY=$(tail -n 1 ${iface}.WEPKEY)
 						if [ -n "${WEP_KEY}" ]
 						then
@@ -85,23 +97,36 @@ config_wireless() {
 
 config_ip() {
 	cd /tmp/setup.opts
-	dialog --visit-items --title "TCP/IP setup" --menu "You can use DHCP to automatically configure a network interface or you can specify an IP and related settings manually. Choose one option:" 20 60 7 1 "Use DHCP to auto-detect my network settings" 2 "Specify an IP address manually" 2> ${iface}.DHCP
+	dialog --visit-items --title "TCP/IP setup" \
+		--menu "You can use DHCP to automatically configure a network interface or you can specify an IP and related settings manually.  Choose one option:" \
+		20 60 7 1 "Use DHCP to auto-detect my network settings" \
+		2 "Specify an IP address manually" 2> ${iface}.DHCP
 	DHCP=$(tail -n 1 ${iface}.DHCP)
 	case ${DHCP} in
 		1)
 			/sbin/dhcpcd -n -t 10 -h $(hostname) ${iface} &
 		;;
 		2)
-			dialog --visit-items --title "IP address" --inputbox "Please enter an IP address for ${iface}:" 20 50 "192.168.1.1" 2> ${iface}.IP
+			dialog --visit-items --title "IP address" \
+			--inputbox "Please enter an IP address for ${iface}:" \
+			20 50 "192.168.1.1" 2> ${iface}.IP
 			IP=$(tail -n 1 ${iface}.IP)
 			BC_TEMP=$(echo $IP|cut -d . -f 1).$(echo $IP|cut -d . -f 2).$(echo $IP|cut -d . -f 3).255
-			dialog --visit-items --title "Broadcast address" --inputbox "Please enter a Broadcast address for ${iface}:" 20 50 "${BC_TEMP}" 2> ${iface}.BC
+			dialog --visit-items --title "Broadcast address" \
+				--inputbox "Please enter a Broadcast address for ${iface}:" \
+				20 50 "${BC_TEMP}" 2> ${iface}.BC
 			BROADCAST=$(tail -n 1 ${iface}.BC)
-			dialog --visit-items --title "Network mask" --inputbox "Please enter a Network Mask for ${iface}:" 20 50 "255.255.255.0" 2> ${iface}.NM
+			dialog --visit-items --title "Network mask"
+				--inputbox "Please enter a Network Mask for ${iface}:" \
+				20 50 "255.255.255.0" 2> ${iface}.NM
 			NETMASK=$(tail -n 1 ${iface}.NM)
-			dialog --visit-items --title "Gateway" --inputbox "Please enter a Gateway for ${iface} (hit enter for none:)" 20 50 2> ${iface}.GW
+			dialog --visit-items --title "Gateway" \
+				--inputbox "Please enter a Gateway for ${iface} (hit enter for none:)" \
+				20 50 2> ${iface}.GW
 			GATEWAY=$(tail -n 1 ${iface}.GW)
-			dialog --visit-items --title "DNS server" --inputbox "Please enter a name server to use (hit enter for none:)" 20 50 2> ${iface}.DNS
+			dialog --visit-items --title "DNS server"\
+				--inputbox "Please enter a name server to use (hit enter for none:)" \
+				20 50 2> ${iface}.DNS
 			DNS=$(tail -n 1 ${iface}.DNS)
 			ifconfig ${iface} ${IP} broadcast ${BROADCAST} netmask ${NETMASK}
 			if [ -n "${GATEWAY}" ]
@@ -110,7 +135,9 @@ config_ip() {
 			fi
 			if [ -n "${DNS}" ]
 			then
-				dialog --visit-items --title "DNS Search Suffix" --inputbox "Please enter any domains which you would like to search on DNS queries (hit enter for none:)" 20 50 2> ${iface}.SUFFIX
+				dialog --visit-items --title "DNS Search Suffix" \
+					--inputbox "Please enter any domains which you would like to search on DNS queries (hit enter for none:)" \
+					20 50 2> ${iface}.SUFFIX
 				SUFFIX=$(tail -n 1 ${iface}.SUFFIX)
 				echo "nameserver ${DNS}" > /etc/resolv.conf
 				if [ -n "${SUFFIX}" ]
@@ -218,7 +245,9 @@ while true; do
 	show_ifmenu
 done
 
-dialog --visit-items --title "Network setup" --menu "This script is designed to setup both wired and wireless network settings.  All questions below apply to the ${iface} interface only.  Choose one option:" 20 60 7 1 "My network is wireless" 2 "My network is wired" 2> ${iface}.WIRED_WIRELESS
+dialog --visit-items --title "Network setup" \
+	--menu "This script is designed to setup both wired and wireless network settings.  All questions below apply to the ${iface} interface only.  Choose one option:" \
+	20 60 7 1 "My network is wireless" 2 "My network is wired" 2> ${iface}.WIRED_WIRELESS
 WIRED_WIRELESS=$(tail -n 1 ${iface}.WIRED_WIRELESS)
 case ${WIRED_WIRELESS} in
 	1)