mockspec: Filter out macros

[bin.git] / phablet-install

diff --git a/phablet-install b/phablet-install
index 3cfccda1ad7da656626321045b873fc73e9c3145..8ff6695b7c14f9507365a02a3b47b5be77faeaff 100755 (executable)
--- a/phablet-install
+++ b/phablet-install
@@ -1,12 +1,12 @@
 #!/bin/sh
 set -e
 
-CHANNEL=devel-proposed
+CHANNEL=${CHANNEL:=devel-proposed}
 MYNAME=$(getent passwd `whoami` | cut -f5 -d: | cut -f1 -d,)
 MYMAIL=${DEBMEMAIL:-$EMAIL}
 
 # flash the latest image
-phablet-flash ubuntu-system --no-backup --channel $CHANNEL
+ubuntu-device-flash --channel devel-proposed
 
 # make image writable
 adb shell "touch /userdata/.writable_image"
@@ -17,10 +17,11 @@ echo "rebooting to activate writable image..."
 adb reboot
 adb wait-for-device
 
+# enable network
+phablet-network -n /etc/NetworkManager/system-connections/pittinet
+
 # install some necessary packages
-echo "connect to wifi now and press Enter"
-read n
-adb shell "apt-get install -y vim bzr ubuntu-ui-toolkit-autopilot ofono-phonesim"
+adb shell "apt-get install -y vim bzr build-essential fakeroot"
 
 # set up bzr, vim, ssh
 adb shell "su -c 'mkdir ~/.ssh' phablet"