# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1332540977 -3600
# Node ID 7a4e0828dd34f68107c5653e6f008690bc874129
# Parent  ed15185975c22c696b86c940bde2b9fea5110cac
netbox: fix PPP modem dialup

diff -r ed15185975c2 -r 7a4e0828dd34 tinyutils/netbox
--- a/tinyutils/netbox	Tue Mar 20 23:36:16 2012 +0200
+++ b/tinyutils/netbox	Fri Mar 23 23:16:17 2012 +0100
@@ -511,8 +511,8 @@
 			<label>"<b>Username: </b>"</label>
 		</text>
 		<entry>
-			<input>USER=\$(grep -s ^ACCOUNT= /etc/ppp/scripts/ppp-on | cut -f1); echo "\${USER#*=}"</input>
-			<variable>USER</variable>
+			<input>NAME=\$(grep -s ^ACCOUNT= /etc/ppp/scripts/ppp-on | cut -f1); echo "\${NAME#*=}"</input>
+			<variable>NAME</variable>
 		</entry>
 	</hbox>
 	<hbox>
@@ -540,19 +540,19 @@
 		<button>
 			<input file icon="accessories-text-editor"></input>
 			<label>Tune</label>
-			<action>[ -n "\$NAME" ] && sed -i \"s/^ACCOUNT=.*/ACCOUNT=\$NAME/\" /etc/ppp/scripts/ppp-on</action>
-			<action>[ -n "\$PASS" ] && sed -i \"s/^PASSWORD=.*/PASSWORD=\$PASS/\" /etc/ppp/scripts/ppp-on</action>
-			<action>[ -n "\$PHONE" ] && sed -i \"s/^TELEPHONE=.*/TELEPHONE=\$PHONE/\" /etc/ppp/scripts/ppp-on</action>
+			<action>[ -n "\$NAME" ] && sed -i "s/^ACCOUNT=.*/ACCOUNT=\$NAME/" /etc/ppp/scripts/ppp-on</action>
+			<action>[ -n "\$PASS" ] && sed -i "s/^PASSWORD=.*/PASSWORD=\$PASS/" /etc/ppp/scripts/ppp-on</action>
+			<action>[ -n "\$PHONE" ] && sed -i "s/^TELEPHONE=.*/TELEPHONE=\$PHONE/" /etc/ppp/scripts/ppp-on</action>
 			<action type="lauch">leafpad /etc/ppp/scripts/ppp-on</action>
 		</button>
 		<button>
 			<label>Start</label>
 			<input file icon="forward"></input>
-			<action>[ -n "\$USER" ] && grep -qs "^\"\$USER\"" /etc/ppp/pap-secrets
-			&& echo "\"\$USER\"	*	\"\$PASS\"" >> /etc/ppp/pap-secrets</action>
-			<action>[ -n "\$USER" ] && grep -qs "^\"\$USER\"" /etc/ppp/chap-secrets
-			&& echo "\"\$USER\"	*	\"\$PASS\"" >> /etc/ppp/chap-secrets</action>
-			<action>[ -n "\$NAME" ] && sed -i \"s/^name .*/name \$NAME/\" /etc/ppp/options</action>
+			<action>[ -n "\$NAME" ] && grep -qs "^\$NAME" /etc/ppp/pap-secrets \
+				|| echo "\$NAME	*	\$PASS" >> /etc/ppp/pap-secrets</action>
+			<action>[ -n "\$NAME" ] && grep -qs "^\$NAME" /etc/ppp/chap-secrets \
+				|| echo "\$NAME	*	\$PASS" >> /etc/ppp/chap-secrets</action>
+			<action>[ -n "\$NAME" ] && sed -i "s/^name .*/name \$NAME/" /etc/ppp/options</action>
 			<action>/etc/ppp/scripts/ppp-off</action>
 			<action>/etc/ppp/scripts/ppp-on &</action>
 		</button>