浏览代码

Check whether interactive wifi settings are complete

Bob Mottram 8 年前
父节点
当前提交
a253b3b65f
共有 1 个文件被更改,包括 16 次插入4 次删除
  1. 16
    4
      src/freedombone-wifi

+ 16
- 4
src/freedombone-wifi 查看文件

@@ -241,7 +241,7 @@ function networks_from_file {
241 241
                 fi
242 242
                 if [ $ctr -eq 1 ]; then
243 243
                     WIFI_TYPE="$line"
244
-                    if [[ $WIFI_TYPE == $'none' || $WIFI_TYPE == $'None' ]]; then
244
+                    if [[ $WIFI_TYPE == $'none' || $WIFI_TYPE == $'open' ]]; then
245 245
                         echo 'network={' >> $WIFI_CONFIG
246 246
                         echo "  ssid=\"${WIFI_SSID}\"" >> $WIFI_CONFIG
247 247
                         echo '  key_mgmt=NONE' >> $WIFI_CONFIG
@@ -321,6 +321,18 @@ function create_networks_interactive {
321 321
             echo "$WIFI_PASSPHRASE" >> $WIFI_NETWORKS_FILE
322 322
         fi
323 323
 
324
+        if [ ${#WIFI_SSID} -gt 1 ]; then
325
+            if [ ${#WIFI_TYPE} -gt 1 ]; then
326
+                if [[ "${#WIFI_TYPE}" == $'none' || "${#WIFI_TYPE}" == $'open' ]]; then
327
+                    wifi_networks_done='yes'
328
+                else
329
+                    if [ ${#WIFI_PASSPHRASE} -gt 1 ]; then
330
+                        wifi_networks_done='yes'
331
+                    fi
332
+                fi
333
+            fi
334
+        fi
335
+
324 336
         # clear values
325 337
         WIFI_SSID=
326 338
         WIFI_PASSPHRASE=
@@ -350,7 +362,7 @@ function show_help {
350 362
     echo ''
351 363
     echo $'     --help                        Show help'
352 364
     echo $'  -i --interface [wlan0|wlan1...]  Device name'
353
-    echo $'  -t --type [wpa2-psk|none]        Security type'
365
+    echo $'  -t --type [wpa2-psk|none|open]   Security type'
354 366
     echo $'  -s --ssid [id]                   Set SSID'
355 367
     echo $'  -p --passphrase [text]           Set passphrase'
356 368
     echo $'     --hotspot [yes|no]            Create a hotspot'
@@ -441,7 +453,7 @@ else
441 453
     hotspot_off
442 454
 fi
443 455
 
444
-if [[ $WIFI_TYPE != 'none' ]]; then
456
+if [[ "$WIFI_TYPE" != 'none' && "$WIFI_TYPE" != 'open' ]]; then
445 457
     if [ ! $WIFI_PASSPHRASE ]; then
446 458
         echo $'No wifi passphrase was given'
447 459
         exit 2
@@ -457,7 +469,7 @@ if [[ $WIFI_TYPE == 'wpa2-psk' ]]; then
457 469
     exit 0
458 470
 fi
459 471
 
460
-if [[ $WIFI_TYPE == 'none' ]]; then
472
+if [[ "$WIFI_TYPE" == 'none' || "$WIFI_TYPE" == 'open' ]]; then
461 473
     wifi_none "$WIFI_SSID"
462 474
     exit 0
463 475
 fi