@@ -4,8 +4,8 @@ USER=phablet
44USER_ID=32011
55PACKAGE=unity8
66BINARY=unity8
7−TARGET_IP=${TARGET_IP-127.0.0.1}
8−TARGET_SSH_PORT=${TARGET_SSH_PORT-2222}
7+TARGET_IP=127.0.0.1
8+TARGET_SSH_PORT=2222
99TARGET_DEBUG_PORT=3768
1010RUN_OPTIONS=-qmljsdebugger=port:$TARGET_DEBUG_PORT
1111SETUP=false
@@ -14,18 +14,23 @@ PINLOCK=false
1414KEYLOCK=false
1515NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
1616FLIPPED=false
17−CHROOT_PREFIX="/data/ubuntu"
1817SSH_WAS_STARTED=0
1918SSH_STARTED=0
19+PASSWORD=""
20+PASSFILE=""
2021
2122usage() {
22− echo "usage: run_on_device [OPTIONS]\n"
23− echo "Script to setup a build environment for the shell and sync build and run it on the device\n"
23+ echo "usage: run_on_device -a SUDO_PASSWORD [OPTIONS]"
24+ echo
25+ echo "Script to setup a build environment for the shell and sync build and run it on the device"
26+ echo
2427 echo "OPTIONS:"
25− echo " -s, --setup Setup the build environment"
26− echo " -p, --pinlock Enable a PIN lock screen when running"
27− echo " -k, --keylock Enable a Keyboard lock screen when running"
28− echo ""
28+ echo " -a, --password The sudo password to use"
29+ echo " -s, --setup Setup the build environment"
30+ echo " -g, --gdb Run with gdb"
31+ echo " -p, --pinlock Enable a PIN lock screen when running"
32+ echo " -k, --keylock Enable a Keyboard lock screen when running"
33+ echo
2934 echo "IMPORTANT:"
3035 echo " * Make sure to have networking setup on the device beforehand."
3136 echo " * Execute that script from a directory containing unity8 code."
@@ -34,7 +39,7 @@ usage() {
3439
3540start_ssh() {
3641 if [ $SSH_STARTED -eq 0 ]; then
37− exec_with_adb initctl start ssh
42+ adb_sudo initctl start ssh
3843 SSH_STARTED=1
3944 fi
4045}
@@ -44,25 +49,13 @@ exec_with_ssh() {
4449 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -t $USER@$TARGET_IP -p $TARGET_SSH_PORT sudo -u $USER -i bash -ic \"$@\"
4550}
4651
47−exec_with_adb() {
48− if $FLIPPED; then
49− adb shell $@
50− else
51− adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
52− fi
53−}
54−
55−adb_root() {
56− adb root
57− adb wait-for-device
52+adb_sudo() {
53+ adb shell "SUDO_ASKPASS=${PASSFILE} sudo --askpass $@"
5854}
5955
6056install_ssh_key() {
61− ssh-keygen -R $TARGET_IP
62− HOME_DIR="${CHROOT_PREFIX}/home/phablet"
57+ HOME_DIR="/home/phablet"
6358 adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys
64− adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
65− adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
6659 adb shell chmod 700 $HOME_DIR/.ssh
6760 adb shell chmod 600 $HOME_DIR/.ssh/authorized_keys
6861}
@@ -73,8 +66,14 @@ setup_adb_forwarding() {
7366}
7467
7568install_dependencies() {
76− exec_with_adb apt-get update
77− exec_with_adb apt-get -y --force-yes install build-essential rsync bzr ccache gdb ninja-build devscripts equivs unity-plugin-scopes
69+ phablet-config writable-image --remotepassword ${PASSWORD} -p build-essential \
70+ -p rsync \
71+ -p bzr \
72+ -p ccache \
73+ -p gdb \
74+ -p ninja-build \
75+ -p devscripts \
76+ -p equivs
7877}
7978
8079sync_code() {
@@ -108,12 +107,13 @@ run() {
108107 exec_with_ssh "start unity8"
109108}
110109
111−set -- `getopt -n$0 -u -a --longoptions="setup,gdb,pinlock,keylock,help" "sgpkh" "$@"`
110+set -- `getopt -n$0 -u -a --longoptions="password:,setup,gdb,pinlock,keylock,help" "a:sgpkh" "$@"`
112111
113112# FIXME: giving incorrect arguments does not call usage and exit
114113while [ $# -gt 0 ]
115114do
116115 case "$1" in
116+ -a|--password) PASSWORD=$2;;
117117 -s|--setup) SETUP=true;;
118118 -g|--gdb) GDB=true;;
119119 -p|--pinlock) PINLOCK=true;;
@@ -124,21 +124,21 @@ do
124124 shift
125125done
126126
127+if [ -z "${PASSWORD}" ]; then
128+ echo "ERROR: You need to provide a sudo password..."
129+ echo
130+ usage
131+fi
127132
128−adb_root
129−[ "${TARGET_IP}" = "127.0.0.1" ] && setup_adb_forwarding
133+PASSFILE=$( adb shell "FILE=\`mktemp\`
134+ echo \"#!/bin/sh\" > \$FILE
135+ echo \"echo \\\"${PASSWORD}\\\"\" >> \$FILE
136+ chmod +x \$FILE
137+ echo \$FILE" | tr -d '\r' )
130138
131−if [ "`adb shell 'grep -q Ubuntu /etc/lsb-release 2> /dev/null && echo -n FLIPPED'`" = "FLIPPED" ]; then
132− FLIPPED=true
133− CHROOT_PREFIX=""
134− if [ "${TARGET_IP}" != "127.0.0.1" ]; then
135− echo "ERROR: Flipped image detected, adb over TCP/IP isn't supported, yet :/"
136− echo "Unset TARGET_IP and try again."
137− exit 2
138− fi
139−fi
139+setup_adb_forwarding
140140
141−status_output=$(exec_with_adb initctl status ssh)
141+status_output=$(adb_sudo initctl status ssh)
142142if [[ $status_output == "ssh start/running, process "* ]]; then
143143 SSH_WAS_STARTED=1
144144fi
@@ -158,6 +158,8 @@ else
158158 run
159159fi
160160
161+adb shell "rm ${PASSFILE}"
162+
161163if [ $SSH_WAS_STARTED -eq 0 ]; then
162− exec_with_adb initctl stop ssh
164+ adb_sudo initctl stop ssh
163165fi