Merge lp:~pwlars/phablet-tools/network-no-sudo into lp:phablet-tools

[Paul Larson]

Don't use sudo in phablet-network unless it's really needed

We're trying to eliminate the sources of sudo needed in the ci testing process. In this case, even if you specify a network file for phablet-network to use and you have full permissions on it, phablet-network uses sudo to grep for the lines it needs from it unnecessarily. This fixes that so that it should only use sudo if the file is unreadable by the current user.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/408/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/89

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

review: Approve (continuous-integration)

=== modified file 'phablet-network'
--- phablet-network	2014-09-18 11:45:03 +0000
+++ phablet-network	2014-09-23 18:10:40 +0000
@@ -128,8 +128,11 @@
 
     echo Network file is $network_file
 
-    SSID="$(sudo grep ^ssid= "$network_file"|sed 's/^ssid=//')"
-    KEY="$(sudo grep ^psk= "$network_file"|sed 's/^psk=//')"
+    if [ ! -r "$network_file" ]; then
+        SUDO="sudo"
+    fi
+    SSID="$($SUDO grep ^ssid= "$network_file"|sed 's/^ssid=//')"
+    KEY="$($SUDO grep ^psk= "$network_file"|sed 's/^psk=//')"
 
     # No PSK ? Let's check for WEP
     [ -z "$KEY" ] && KEY="$(sudo grep ^wep-key0= "$network_file"|sed 's/^wep-key0=//')"