Fixed multiple bugs related to spaces in filenames.

[scripts.git] / hotspot.sh

diff --git a/hotspot.sh b/hotspot.sh
index e3cac28..adcebb9 100755 (executable)
--- a/hotspot.sh
+++ b/hotspot.sh
@@ -81,8 +81,8 @@ function scan () {
         -e "s/Quality=\([0-9]*\).*$/QUALITY,\1/" \
         -e "s/Encryption key:/ENCRYPTION,/" | \
         awk 'BEGIN { FS="," }
-         {
-           if($1 == "ESSID") { essid=$2 }
+                                                                                        {
+                                                                                            if($1 == "ESSID") { essid=$2 }
            else if($1 == "AP") { ap=$2 }
            else if($1 == "QUALITY") { quality=$2; }
            else if($1 == "ENCRYPTION") {
@@ -258,6 +258,8 @@ if [[ $1 == "-k" ]]; then
     exit 1
 fi
 
+trap cleanup-before-quit EXIT
+
 stty_state=$(stty -g)
 
 trap sigint-handler SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
@@ -295,58 +297,56 @@ while [[ ${cont} == 1 ]]; do
                     ;;
 
                 "\ e")
-                process-key "down"
-                ;;
+                    process-key "down"
+                    ;;
 
                 "\10")
-                process-key "up"
-                ;;
+                    process-key "up"
+                    ;;
 
                 "\e") #$'\033'")
-                current_keymap=escape
-                ;;
+                    current_keymap=escape
+                    ;;
 
                 *)
-                ;;
-                esac
-                ;;
+                    ;;
+            esac
+            ;;
 
-                escape) ##################################################
-                case ${CHAR} in
-                    "$'\033'")
+        escape) ##################################################
+            case ${CHAR} in
+                "$'\033'")
                     process-key "esc-esc"
                     ;;
-                    "[")
+                "[")
                     current_keymap=cursor
                     ;;
-                    *)
+                *)
                     current_keymap=default
                     ;;
-                esac
-                ;;
+            esac
+            ;;
 
-                cursor) ##################################################
+        cursor) ##################################################
 
-                current_keymap=default
+            current_keymap=default
 
-                case ${CHAR} in
-                    A)
+            case ${CHAR} in
+                A)
                     process-key "up"
                     ;;
-                    B)
+                B)
                     process-key "down"
                     ;;
-                    *)
-                    ;;
-                esac
-                ;;
-
                 *)
-                echo "Unknown keymap. This is an internal and weird bug."
-                cont=0
-                ;;
-                esac
+                    ;;
+            esac
+            ;;
 
-                done
+        *)
+            echo "Unknown keymap. This is an internal and weird bug."
+            cont=0
+            ;;
+    esac
 
-                cleanup-before-quit
+done