91dc27c · unity8 · git.iko.soy

on xenial help sign in

Make script look prettier

91dc27cMichael Terry13 years ago

tools/unlock-device+7−9

@@ -13,18 +13,16 @@ if [ -z "$ANDROID_SERIAL" ]; then

13 exit 1

14fi

16−UNLOCK_SCRIPT="

16+UNLOCK_SCRIPT='

17import dbus, logging;

18from unity8 import process_helpers as helpers;

19logging.basicConfig(level=logging.INFO);

20−bus = dbus.SystemBus().get_object(\"com.canonical.powerd\", \"/com/canonical/powerd\");

20+bus = dbus.SystemBus().get_object("com.canonical.powerd", "/com/canonical/powerd");

21−cookie = bus.requestSysState(\"unlock-device-hold\", 1, dbus_interface=\"com.canonical.powerd\");

21+cookie = bus.requestSysState("unlock-device-hold", 1, dbus_interface="com.canonical.powerd");

22helpers.restart_unity_with_testability();

23−bus.clearSysState(cookie, dbus_interface=\"com.canonical.powerd\");

23+bus.clearSysState(cookie, dbus_interface="com.canonical.powerd");

24helpers.unlock_unity()

25−"

25+'

26−

27−RETURN_CODE=0

29retries=0

27retries=0

30while [ $retries -lt $max_retries ]; do

28while [ $retries -lt $max_retries ]; do

@@ -43,9 +41,9 @@ while [ $retries -lt $max_retries ]; do

43 echo "W: Unlock failed, trying again"

41 echo "W: Unlock failed, trying again"

44 else

42 else

45 echo "E: Unlock failed, no more retries"

43 echo "E: Unlock failed, no more retries"

46− RETURN_CODE=1

44+ exit 1

47 fi

45 fi

48 fi

46 fi

49done

47done

51−exit $RETURN_CODE

49+exit 0