slitaz-tools rev 239
netbox: Always show wifi tab
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Jul 16 12:34:56 2008 +0000 (2008-07-16) |
parents | a39fa6fb1bd2 |
children | 29781794a48b |
files | tinyutils/netbox |
line diff
1.1 --- a/tinyutils/netbox Wed Jul 16 09:50:09 2008 +0000 1.2 +++ b/tinyutils/netbox Wed Jul 16 12:34:56 2008 +0000 1.3 @@ -227,10 +227,8 @@ 1.4 </hbox> 1.5 </frame> 1.6 1.7 - <notebook labels="DHCP|PPPoE|PPP|Static IP' 1.8 + <notebook labels="DHCP|PPPoE|PPP|Static IP|Wifi|System wide|VPN|Servers' 1.9 NET_BOX="$NET_BOX$tmp" 1.10 -[ -x /usr/sbin/iwconfig ] && NET_BOX="$NET_BOX|Wifi" 1.11 -NET_BOX="$NET_BOX|System wide|VPN|Servers" 1.12 [ -x /sbin/iptables ] && NET_BOX="$NET_BOX|Firewall" 1.13 tmp='|Etherwake"> 1.14 1.15 @@ -616,7 +614,7 @@ 1.16 <button> 1.17 <label>Start</label> 1.18 <input file icon="forward"></input> 1.19 - <action>[ "$WIFI_KEY_TYPE" = "WPA" -a ! -x /usr/bin/wpa_supplicant ] && xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -geometry 80x17 -title "wpa_supplicant install" -e "tazpkg get-install wpa_supplicant ; echo -e "----\n\nENTER to continue..." && read close"</action> 1.20 + <action>[ "$WIFI_KEY_TYPE" = "WPA" -a ! -x /usr/bin/wpa_supplicant ] && xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -geometry 80x17 -title "wpa_supplicant install" -e "tazpkg get-install wpa_supplicant ; echo -e \"----\n\nENTER to continue...\" && read close"</action> 1.21 <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_INTERFACE=`/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/ /etc/network.conf</action> 1.22 <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_ESSID=`/WIFI_ESSID=\"$WIFI_ESSID\"/ /etc/network.conf</action> 1.23 <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_KEY=`/WIFI_KEY=\"$WIFI_KEY\"/ /etc/network.conf</action> 1.24 @@ -639,6 +637,22 @@ 1.25 </hbox> 1.26 </frame>' 1.27 [ -x /usr/sbin/iwconfig ] && NET_BOX="$NET_BOX$tmp$tmp2" 1.28 +tmp='<frame Wireless> 1.29 + <hbox> 1.30 + <text wrap="true" use-markup="true"> 1.31 + <label> 1.32 +"<i>The package <b>wireless_tools</b> is not yet installed</i>" 1.33 + </label> 1.34 + </text> 1.35 + <button> 1.36 + <input file icon="go-jump"></input> 1.37 + <label>Install</label> 1.38 + <action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -geometry 80x17 -title "wireless_tools install" -e "tazpkg get-install wireless_tools ; echo -e \"----\n\nENTER to continue...\" && read close"</action> 1.39 + <action type="exit">restart</action> 1.40 + </button> 1.41 + </hbox> 1.42 + </frame>' 1.43 +[ -x /usr/sbin/iwconfig ] || NET_BOX="$NET_BOX$tmp" 1.44 tmp='<frame Configuration files> 1.45 <hbox> 1.46 <text use-markup="true">