Merge lp:~ogra/phablet-tools/phablet-tools-fix-phablet-network-spacechar-handling into lp:phablet-tools

[Oliver Grawert]

phablet-network: support network files with spaces in their filename (LP: #1367180), make finding the active UUID not break on non-english locale settings, quieten down glib noise from nmcli on the device

phablet-network: support network files with spaces in their filename (LP: #1367180), make finding the active UUID not break on non-english locale settings, quieten down glib noise from nmcli on the device

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM.

review: Approve

=== modified file 'phablet-network'
--- phablet-network	2014-08-15 10:59:22 +0000
+++ phablet-network	2014-09-18 11:48:47 +0000
@@ -102,22 +102,22 @@
         echo "No wireless adapter found, exiting"
         exit 1
     fi
-   network_active_uuid="$(nmcli -t -f name,uuid,devices,vpn con status | grep $wireless_adapter | egrep ':no$'| cut -d: -f2)"
+   network_active_uuid="$(LC_ALL=C nmcli -t -f name,uuid,devices,vpn con status | grep $wireless_adapter | egrep ':no$'| cut -d: -f2)"
     if [ -z "$network_active_uuid" ]
     then
         echo "No active wifi network connection, exiting"
         exit 1
     fi
-    network_file=$(sudo grep -H "$network_active_uuid" /etc/NetworkManager/system-connections/* | grep uuid | cut -f1 -d:)
+    network_file=$(sudo grep -H "$network_active_uuid" $NETWORK_MANAGER/* | grep uuid | cut -f1 -d:)
 
     echo "$network_file"
 }
 
 setup_connection() {
     if [ -z "$OPTION_NETWORK_FILE" ]; then
-        network_file=$(find_active_network)
+        network_file="$(find_active_network)"
     else
-        network_file=$OPTION_NETWORK_FILE
+        network_file="$OPTION_NETWORK_FILE"
     fi
 
     if [ ! -f "$network_file" ]
@@ -128,11 +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=//')"
+    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=//')"
+    [ -z "$KEY" ] && KEY="$(sudo grep ^wep-key0= "$network_file"|sed 's/^wep-key0=//')"
 
     # Still no key ?
     if [ -z "$KEY" ]; then
@@ -141,7 +141,7 @@
     fi
 
     echo Provisioning network on device
-    adb shell "nmcli device wifi connect ${SSID} password '${KEY}'"
+    adb shell "nmcli device wifi connect ${SSID} password '${KEY}' 2>/dev/null"
 
     echo
     echo Network setup complete