wls now offers to autoconnect to known networks

2 files changed, 36 insertions, 16 deletions

diff --git a/ratdm b/ratdm
index 19ea8f2..916386d 100755
--- a/ratdm
+++ b/ratdm
@@ -1,11 +1,13 @@
 #!/usr/bin/env sh
 
-font="-*-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
+font="DejaVu Sans Mono:size=13" 
+#"-*-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
 screen=$(ratpoison -c sdump | tr ',' '\n' | grep '1$')
 width=$(echo $screen | cut -d ' ' -f 4)
 height=$(echo $screen | cut -d ' ' -f 5)
 s=$(echo $screen | cut -d ' ' -f 1)
-w=$(($width/3))
-h=$(($height/5*2))
+w=$width #$(($width/2))
+x=0 #$(($width/4))
+y=$(($height/3))
 
-dmenu -p "Select >" -l 16 -s $s -x $w -y $h -w $w -sb '#0B0' -sf black -nb '#000' -fn $font -i -p foo "$@"
+dmenu -p "Select >" -l 16 -s $s -x $x -y $y -w $w -sb '#0B0' -sf black -nb '#000' -fn "$font" -i -p foo "$@"
diff --git a/wls b/wls
index 5fc9848..38d4f7a 100755
--- a/wls
+++ b/wls
@@ -2,26 +2,44 @@
 
 # Terribly written wireless network control script
 
+connect() {
+    sudo wpa_supplicant -B -i wlan0 -c "$1"
+    sleep 3s
+    sudo dhcpcd wlan0
+}
+
 dird="${HOME}/.config/wireless"
 
 sudo killall wpa_supplicant &> /dev/null
-sudo dhcpcd -k wlp2s2 &> /dev/null
+sudo dhcpcd -k wlan0 &> /dev/null
+sudo ip link set wlan0 up &> /dev/null
 
+ssids=$(sudo iw dev wlan0 scan | grep SSID | cut -d\  -f 2-)
+for s in $ssids; do
+    if [ -f "$dird/$s" ]; then
+        echo -n "Connect to $s? [y]/* "
+        y=""; read y;
+        if [ -z $y ]; then
+            connect "$dird/$s"
+            exit 0;
+        fi;
+    fi;     
+done;
+    
 ls $dird
 echo -n "--> "
 read ssid
 
 if [ ! -f "$dird/$ssid" ]; then
-	echo Creating new network profile, enter passphrase: 
-	read pass
-	wpa_passphrase $ssid "$pass" > $dird/$ssid
-	echo "Edit file (y/[n])? "
-	read edit
-	if [ "$edit" == "y" ]; then
-		$EDITOR $dird/$ssid
-	fi;
+	  echo Creating new network profile, enter passphrase: 
+	  read pass
+	  wpa_passphrase $ssid "$pass" > $dird/$ssid
+	  echo "Edit file (y/[n])? "
+	  read edit
+	  if [ "$edit" == "y" ]; then
+		    $EDITOR $dird/$ssid
+	  fi;
 fi;
 
-sudo wpa_supplicant -B -D wext -i wlp2s2 -c "$dird/$ssid"
-sleep 3s
-sudo dhcpcd wlp2s2
+connect "$dird/$ssid"
+