Handle future adb user changes
commitcb25093380dd1ac983846ca84aa3a7a61412a838
authorMichael Terry <michael.terry@canonical.com>
dateWed 27 Aug 2014, 15:01 (12 years ago)
parent8858408
tools/unlock-device+3−1
@@ -19,7 +19,9 @@ done
1919
2020eval "$WAIT_COMMAND"
2121
22−UNLOCK_OUTPUT=$(adb shell "sudo -u phablet -i gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked" 2>&1)
22+GDBUS_CMD="gdbus call --session --dest com.canonical.UnityGreeterd --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked"
23+
24+UNLOCK_OUTPUT=$(adb shell "if [ \"\$(id -u)\" = 0 ]; then sudo -u phablet -i $GDBUS_CMD; else $GDBUS_CMD; fi" 2>&1)
2325if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then
2426 echo "I: Unlock passed"
2527 exit 0