git.iko.soy/unity8
on xenial help sign in
Review nits
6840d4fMichael Terry
tools/unlock-device+20−32
compare with xenial
unifiedsplit
@@ -2,16 +2,15 @@
2# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
2# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
3
3
4# Our goal here is to get an Ubuntu Touch device into a testable unlocked state.
4# Our goal here is to get an Ubuntu Touch device into a testable unlocked state.
5−# This will include reboots.
5+# This will include a reboot.
6
6
7−boot_delay=20
7+while getopts s: opt; do
8−max_retries=5
8+ case $opt in
9−
9+ s)
10−ANDROID_SERIAL=$1
10+ export ANDROID_SERIAL=$OPTARG
11−if [ -z "$ANDROID_SERIAL" ]; then
11+ ;;
12− echo "E: Please provide an adb device number as an argument"
12+ esac
13− exit 1
13+done
14−fi
15
14
16UNLOCK_SCRIPT='
15UNLOCK_SCRIPT='
17import dbus, logging;
16import dbus, logging;
@@ -24,26 +23,15 @@ bus.clearSysState(cookie, dbus_interface="com.canonical.powerd");
24helpers.unlock_unity()
23helpers.unlock_unity()
25'
24'
26
25
27−retries=0
28−while [ $retries -lt $max_retries ]; do
29− ((retries += 1))
30− adb -s $ANDROID_SERIAL reboot
26+adb reboot
31− sleep 5
27+sleep 5
32− adb -s $ANDROID_SERIAL "wait-for-device"
28+adb "wait-for-device"
33− sleep $boot_delay
29+sleep 20
34− UNLOCK_OUTPUT=$(adb -s $ANDROID_SERIAL shell "sudo -u phablet -i python3 -c '$UNLOCK_SCRIPT'" 2>&1)
30+UNLOCK_OUTPUT=$(adb shell "sudo -u phablet -i python3 -c '$UNLOCK_SCRIPT'" 2>&1)
35− if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then
31+if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then
36− echo "I: Unlock passed"
32+ echo "I: Unlock passed"
37− retries=$max_retries
33+ exit 0
38− else
34+else
39− echo "I: Unlock script output: '$UNLOCK_OUTPUT'"
35+ echo "I: Unlock failed, script output: '$UNLOCK_OUTPUT'"
40− if [ $retries -lt $max_retries ]; then
41− echo "W: Unlock failed, trying again"
42− else
43− echo "E: Unlock failed, no more retries"
44− exit 1
36+ exit 1
45− fi
37+fi
46− fi
47−done
48−
49−exit 0