Merge lp:~toykeeper/phablet-tools/phablet-network-no-nm into lp:phablet-tools

[Selene Scriven]

This fixes Bug #1427559 (phablet-network requires NetworkManager).

It adds support for an optional dotfile to specify the data the script would otherwise try to detect from NetworkManager. With no dotfile, the script acts the same as before, but by adding a dotfile it allows people to use phablet-network in half a dozen corner cases which would otherwise fail.

This fixes Bug #1427559 (phablet-network requires NetworkManager).

It adds support for an optional dotfile to specify the data the script would otherwise try to detect from NetworkManager. With no dotfile, the script acts the same as before, but by adding a dotfile it allows people to use phablet-network in half a dozen corner cases which would otherwise fail.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/435/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/435/rebuild

review: Approve (continuous-integration)

[lp:~toykeeper/phablet-tools/phablet-network-no-nm]

337. By Selene Scriven on 2015-03-03

reverted previous change, using a different method

338. By Selene Scriven on 2015-03-03

Simpler, better method. Try CLI option, then default dotfile, then auto-detect.

[Oliver Grawert (ogra)]

looks good ...

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/436/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/436/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Minor nitpick.

review: Needs Fixing

[Robert Bruce Park (robru)]

ooops, nm, lgtm.

review: Approve

=== modified file 'phablet-network'
--- phablet-network	2015-02-10 14:50:47 +0000
+++ phablet-network	2015-03-03 09:25:01 +0000
@@ -27,6 +27,7 @@
 usage: $0 [OPTIONS]
 
 Copies ACTIVE network manager connection into device
+(or uses NM-format wifi config from $DEFAULT_NETWORK_FILE)
 
 OPTIONS:
   -h	Show this message
@@ -42,6 +43,7 @@
 }
 
 OPTION_NETWORK_FILE=""
+DEFAULT_NETWORK_FILE="$HOME/.phablet-network"
 SKIP_SETUP=""
 SKIP_WAIT=""
 WAIT_TIMEOUT="80s"
@@ -113,10 +115,12 @@
 }
 
 setup_connection() {
-    if [ -z "$OPTION_NETWORK_FILE" ]; then
+    if [ ! -z "$OPTION_NETWORK_FILE" ]; then
+        network_file="$OPTION_NETWORK_FILE"
+    elif [ -f "$DEFAULT_NETWORK_FILE" ]; then
+        network_file="$DEFAULT_NETWORK_FILE"
+    else
         network_file="$(find_active_network)"
-    else
-        network_file="$OPTION_NETWORK_FILE"
     fi
 
     if [ ! -f "$network_file" ]