Merge lp:~sergiusens/phablet-tools/common_scripts into lp:phablet-tools

[Sergio Schvezov]

Adding a common script to ref from other scripts and removing ADBOPTS in favor of ANDROID_SERIAL
Fixing minor whitespace issues

[Oliver Grawert (ogra)]

looks good ...

review: Approve

=== modified file 'phablet-network'
--- phablet-network	2014-04-14 20:48:07 +0000
+++ phablet-network	2014-05-14 13:06:51 +0000
@@ -14,6 +14,12 @@
 #
 # Copyright (C) 2012 Canonical, Ltd.
 
+if [ -f "$(dirname $0)/shell-adb-common.sh" ]; then
+    . "$(dirname $0)/shell-adb-common.sh"
+else
+    . "/usr/share/phabletutils/shell-adb-common.sh"
+fi
+
 export LC_ALL=C
 
 usage() {
@@ -24,7 +30,7 @@
 
 OPTIONS:
   -h	Show this message
-  -s    Specify the serial of the device to install (see adb $ADBOPTS devices)
+  -s    Specify the serial of the device to install
   -n    Select network file
   -t    Timeout for waiting on network connection to become active.
         Default=$WAIT_TIMEOUT
@@ -35,7 +41,6 @@
 EOF
 }
 
-ADBOPTS=""
 OPTION_NETWORK_FILE=""
 SKIP_SETUP=""
 SKIP_WAIT=""
@@ -55,26 +60,26 @@
             ;;
         -n)
             shift;
-	    OPTION_NETWORK_FILE=$1
-            shift;
-            ;;
-	-s)
-            shift;
-            ADBOPTS="-s $1"
-            shift;
-            ;;
-	-t|--timeout)
+            OPTION_NETWORK_FILE=$1
+            shift;
+            ;;
+        -s)
+            shift;
+            SERIAL="$1"
+            shift;
+            ;;
+        -t|--timeout)
             shift;
             WAIT_TIMEOUT=$1
             shift;
             ;;
-	--skip-wait)
+        --skip-wait)
             shift;
-	    SKIP_WAIT=1
+	        SKIP_WAIT=1
             ;;
-	--skip-setup)
+	    --skip-setup)
             shift;
-	    SKIP_SETUP=1
+            SKIP_SETUP=1
             ;;
         --)
             shift;
@@ -83,6 +88,11 @@
     esac
 done
 
+
+# exporting ANDROID_SERIAL to support multiple devices connected
+# seamlessly
+[ -z "$SERIAL" ] || export ANDROID_SERIAL="$SERIAL"
+
 NETWORK_MANAGER=/etc/NetworkManager/system-connections
 
 find_active_network() {
@@ -125,8 +135,8 @@
 
     echo Provisioning network file to device
     target_network_file=$NETWORK_MANAGER/active_ws_connection.conf
-    adb $ADBOPTS push $TMP_FILE $target_network_file
-    adb $ADBOPTS shell "chmod 600 $target_network_file"
+    adb push $TMP_FILE $target_network_file
+    adb shell "chmod 600 $target_network_file"
 
     rm -f $TMP_FILE
 
@@ -142,7 +152,7 @@
 	    # the logic below will ensure that DNS resolution part of the
 	    # ping worked, which should be enough to prove to us that the
 	    # network stack is ready
-            if adb $ADBOPTS shell ping -c1 launchpad.net | grep PING ; then
+            if adb shell ping -c1 launchpad.net | grep PING ; then
                 exit 0
             fi
             done
@@ -153,14 +163,7 @@
     fi
 }
 
-# Quick way to make sure that we fail gracefully if more than one device 
-# is connected and no serial is passed
-err="$(adb $ADBOPTS wait-for-device 2>&1)"
-if [ "$err" = "error: more than one device and emulator" ]; then
-    echo "$err"
-    adb devices
-    exit 1
-fi
+check_devices
 
 [ -n "$SKIP_SETUP" ] || setup_connection
 [ -n "$SKIP_WAIT" ] || wait_for_network

=== modified file 'phablet-screenshot'
--- phablet-screenshot	2014-05-08 12:44:41 +0000
+++ phablet-screenshot	2014-05-14 13:06:51 +0000
@@ -22,6 +22,12 @@
 # Street, Fifth Floor, Boston, MA 02110-1301 USA
 set -eu
 
+if [ -f "$(dirname $0)/shell-adb-common.sh" ]; then
+    . "$(dirname $0)/shell-adb-common.sh"
+else
+    . "/usr/share/phabletutils/shell-adb-common.sh"
+fi
+
 PICDIR=$(mktemp -d /tmp/$(basename $0).XXXXXX)
 FBDEV=fb0
 SERIAL=""
@@ -78,20 +84,6 @@
     fi
 }
 
-check_devices() {
-    # Quick way to make sure that we fail gracefully if more than one device 
-    # is connected and no serial is passed
-    set +e
-    adb wait-for-device
-    err=$?
-    set -e
-    if [ $err != 0 ]; then
-        echo "E: more than one device or emulator"
-        adb devices
-        exit 1
-    fi
-}
-
 sf_is_running() {
     #  Return 0 if surface flinger is running then we'll use screencap
     #  instead

=== modified file 'phablet-test-run'
--- phablet-test-run	2014-04-01 01:36:31 +0000
+++ phablet-test-run	2014-05-14 13:06:51 +0000
@@ -14,6 +14,12 @@
 #
 # Copyright (C) 2012 Canonical, Ltd.
 
+if [ -f "$(dirname $0)/shell-adb-common.sh" ]; then
+    . "$(dirname $0)/shell-adb-common.sh"
+else
+    . "/usr/share/phabletutils/shell-adb-common.sh"
+fi
+
 TESTSUITE=""
 TESTPACKAGES=""
 LOCALPACKAGES=""
@@ -24,7 +30,6 @@
 
 EXECUTE_COMMAND=0
 USER=phablet
-ADBOPTS=""
 NOSHELL=0
 RETVAL=0
 VERBOSE=""
@@ -53,15 +58,15 @@
 }
 
 wait_for_device() {
-    adb $ADBOPTS wait-for-device
+    adb wait-for-device
 }
 
 exec_with_adb() {
-    adb $ADBOPTS shell /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
+    adb shell /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
 }
 
 exec_with_adb_user() {
-    adb $ADBOPTS shell sudo -u $USER -i "$@"
+    adb shell sudo -u $USER -i "$@"
 }
 
 install_packages() {
@@ -196,7 +201,7 @@
         TESTPACKAGES="$TESTPACKAGES $OPTARG"
         ;;
     s)
-        ADBOPTS="-s $OPTARG"
+        SERIAL="$OPTARG"
         ;;
     x)
         EXECUTE_COMMAND=1
@@ -209,12 +214,19 @@
 
 shift $((OPTIND - 1))
 
+
+# exporting ANDROID_SERIAL to support multiple devices connected
+# seamlessly
+[ -z "$SERIAL" ] || export ANDROID_SERIAL="$SERIAL"
+
 TESTSUITE=$@
 if test -z "$TESTSUITE"; then
     echo To run a test please specify a test suite
     exit 0
 fi
 
+check_devices
+
 install_packages
 
 if [ $NOSHELL -eq 1 ]; then

=== modified file 'setup.py'
--- setup.py	2014-04-05 17:01:01 +0000
+++ setup.py	2014-05-14 13:06:51 +0000
@@ -20,6 +20,10 @@
     'phablet-bootchart',
     ]
 
+DATA_FILES = [
+    ('/usr/share/phabletutils/', ['shell-adb-common.sh', ]),
+    ]
+
 if __name__ == "__main__":
     setup(
         name='phablet-tools',
@@ -30,5 +34,6 @@
         license='GPLv3',
         packages=find_packages(exclude=("tests",)),
         scripts=PYTHON_SCRIPTS + SH_SCRIPTS,
+        data_files=DATA_FILES,
         test_suite='tests',
     )

=== added file 'shell-adb-common.sh'
--- shell-adb-common.sh	1970-01-01 00:00:00 +0000
+++ shell-adb-common.sh	2014-05-14 13:06:51 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the applicable version of the GNU General Public
+# License for more details.
+#.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (C) 2014 Canonical, Ltd.
+
+check_devices() {
+    # Quick way to make sure that we fail gracefully if more than one device 
+    # is connected and no serial is passed
+    set +e
+    adb wait-for-device
+    err=$?
+    set -e
+    if [ $err != 0 ]; then
+        echo "E: more than one device or emulator"
+        adb devices
+        exit 1
+    fi
+}