Merge lp:~ogra/phablet-tools/pahblet-network-drop-root into lp:phablet-tools

[Oliver Grawert]

drop the need for root on the target device when configuring the wlan

drop the need for root on the target device when configuring the wlan

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~ogra/phablet-tools/pahblet-network-drop-root]

294. By Oliver Grawert on 2014-08-15

add quoting around the KEY since apparently spaces in wlan keys are allowed

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'phablet-network'
--- phablet-network	2014-05-14 13:05:18 +0000
+++ phablet-network	2014-08-15 10:59:45 +0000
@@ -128,17 +128,20 @@
 
     echo Network file is $network_file
 
-    TMP_FILE=$(mktemp)
-    CMD="grep -v mac-address"
-    [ ! -r "$network_file" ] && CMD="sudo $CMD"
-    $CMD "$network_file" > $TMP_FILE
-
-    echo Provisioning network file to device
-    target_network_file=$NETWORK_MANAGER/active_ws_connection.conf
-    adb push $TMP_FILE $target_network_file
-    adb shell "chmod 600 $target_network_file"
-
-    rm -f $TMP_FILE
+    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=//')"
+
+    # Still no key ?
+    if [ -z "$KEY" ]; then
+        echo "Could neither find WEP nor WPA-PSK key !"
+        exit 1
+    fi
+
+    echo Provisioning network on device
+    adb shell "nmcli device wifi connect ${SSID} password '${KEY}'"
 
     echo
     echo Network setup complete