Ubuntu Pastebin

Paste from ogra at Tue, 3 Mar 2015 09:04:39 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
--- phablet-network.orig	2015-03-03 09:57:18.083754813 +0100
+++ phablet-network	2015-03-03 10:04:38.051758677 +0100
@@ -41,7 +41,8 @@
 EOF
 }
 
-OPTION_NETWORK_FILE=""
+OPTION_NETWORK_FILE="~/.phablet-network"
+MANUAL=""
 SKIP_SETUP=""
 SKIP_WAIT=""
 WAIT_TIMEOUT="80s"
@@ -61,6 +62,7 @@
         -n)
             shift;
             OPTION_NETWORK_FILE=$1
+            MANUAL=1
             shift;
             ;;
         -s)
@@ -114,10 +116,9 @@
 }
 
 setup_connection() {
-    if [ -z "$OPTION_NETWORK_FILE" ]; then
+    network_file="$OPTION_NETWORK_FILE"
+    if [ -z "$MANUAL" ] && [ ! -e "$OPTION_NETWORK_FILE" ]; then
         network_file="$(find_active_network)"
-    else
-        network_file="$OPTION_NETWORK_FILE"
     fi
 
     if [ ! -f "$network_file" ]
Download as text