SliTaz Repositories

     1.1 --- a/tinyutils/netbox	Sat Jul 19 06:35:45 2008 +0000
     1.2 +++ b/tinyutils/netbox	Sat Jul 19 09:05:03 2008 +0000
     1.3 @@ -3,7 +3,7 @@
     1.4  # Gtkdialog box to manage network connection.
     1.5  # - SliTaz GNU/Linux 2008.
     1.6  #
     1.7 -VERSION=20080113
     1.8 +VERSION=20080719
     1.9  
    1.10  # Check if user is root.
    1.11  check_root()
    1.12 @@ -195,7 +195,7 @@
    1.13  IFCONFIG="$IFCONFIG$tmp"
    1.14  
    1.15  # The main dialog with notebook, start/stop buttons and all options.
    1.16 -# Note that /etc/network.conf is seded when an interafce is active.
    1.17 +# Note that /etc/network.conf is seded when an interface is activate
    1.18  #
    1.19  NET_BOX='
    1.20  <window title="SliTaz Netbox Manager" icon-name="network-wired">
    1.21 @@ -478,7 +478,7 @@
    1.22          </text>
    1.23  	<combobox>'
    1.24  . /etc/network.conf
    1.25 -tmp2="$tmp2<item>$WIFI_ESSID</item>$ESSIDS"
    1.26 +tmp2="$tmp2<item>$WIFI_ESSID</item>$ESSIDS<variable>WIFI_ESSID</variable>"
    1.27  tmp3='</combobox>
    1.28        </hbox>
    1.29        <hbox>
    1.30 @@ -489,12 +489,12 @@
    1.31            <input>. /etc/network.conf; echo "$WIFI_KEY"</input>
    1.32            <variable>WIFI_KEY</variable>
    1.33          </entry>
    1.34 -	<combobox>
    1.35 -	  <item>none</item>
    1.36 -	  <item>WEP</item>
    1.37 -	  <item>WPA</item>
    1.38 -	  <item>any</item>
    1.39 -          <variable>WIFI_KEY_TYPE</variable>
    1.40 +	<combobox>'
    1.41 +tmp2="$tmp2$tmp3<item>$WIFI_KEY_TYPE</item>"
    1.42 +for i in none WEP WPA any; do
    1.43 +  [ "$i" = "$WIFI_KEY_TYPE" ] || tmp2="$tmp2<item>$i</item>"
    1.44 +done
    1.45 +tmp3='  <variable>WIFI_KEY_TYPE</variable>
    1.46  	</combobox>
    1.47        </hbox>
    1.48        </vbox>
    1.49 @@ -629,12 +629,14 @@
    1.50            <label>Start</label>
    1.51            <input file icon="forward"></input>
    1.52  	  <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.53 -          <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_INTERFACE=`/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/ /etc/network.conf</action>
    1.54 -          <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_ESSID=`/WIFI_ESSID=\"$WIFI_ESSID\"/ /etc/network.conf</action>
    1.55 -          <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_KEY=`/WIFI_KEY=\"$WIFI_KEY\"/ /etc/network.conf</action>
    1.56 -          <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_KEY_TYPE=`/WIFI_KEY_TYPE=\"$WIFI_KEY_TYPE\"/ /etc/network.conf</action>
    1.57 -          <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_MODE=`/WIFI_MODE=\"$WIFI_MODE\"/ /etc/network.conf</action>
    1.58 -          <action>sed -i s/`cat /etc/network.conf | grep ^WIFI_CHANNEL=`/WIFI_CHANNEL=\"$WIFI_CHANNEL\"/ /etc/network.conf</action>
    1.59 +          <action>sed -i s/`grep ^WIFI= /etc/network.conf`/WIFI=\"yes\"/ /etc/network.conf</action>
    1.60 +          <action>sed -i s/`grep ^WIFI_INTERFACE= /etc/network.conf`/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/ /etc/network.conf</action>
    1.61 +          <action>sed -i s/`grep ^WIFI_ESSID= /etc/network.conf`/WIFI_ESSID=\"$WIFI_ESSID\"/ /etc/network.conf</action>
    1.62 +          <action>sed -i s/`grep ^WIFI_KEY= /etc/network.conf`/WIFI_KEY=\"$WIFI_KEY\"/ /etc/network.conf</action>
    1.63 +          <action>sed -i s/`grep ^WIFI_MODE= /etc/network.conf`/WIFI_MODE=\"$WIFI_MODE\"/ /etc/network.conf</action>
    1.64 +          <action>sed -i "s/`grep ^WIFI_IWCONFIG_ARGS= /etc/network.conf`/WIFI_IWCONFIG_ARGS=\"$WIFI_IWCONFIG_ARGS\"/" /etc/network.conf</action>
    1.65 +          <action>sed -i s/`grep ^WIFI_KEY_TYPE= /etc/network.conf`/WIFI_KEY_TYPE=\"$WIFI_KEY_TYPE\"/ /etc/network.conf</action>
    1.66 +          <action>sed -i s/`grep ^WIFI_CHANNEL= /etc/network.conf`/WIFI_CHANNEL=\"$WIFI_CHANNEL\"/ /etc/network.conf</action>
    1.67            <action>[ -s /var/run/udhcpc.$WIFI_INTERFACE.pid ] && kill `cat /var/run/udhcpc.$WIFI_INTERFACE.pid`</action>
    1.68            <action>ifconfig $WIFI_INTERFACE down</action>
    1.69            <action>iwconfig $WIFI_INTERFACE txpower auto</action>
    1.70 @@ -643,6 +645,7 @@
    1.71          <button>
    1.72            <label>Stop</label>
    1.73            <input file icon="stop"></input>
    1.74 +          <action>sed -i s/`grep ^WIFI= /etc/network.conf`/WIFI=\"no\"/ /etc/network.conf</action>
    1.75            <action>[ -x /etc/init.d/wpa_supplicant ] && /etc/init.d/wpa_supplicant stop</action>
    1.76            <action>ifconfig $WIFI_INTERFACE down</action>
    1.77            <action>iwconfig $WIFI_INTERFACE txpower off</action>