on xenial help sign in
Fix run_on_device issues.
a670dfbMichał Sawicz
run_on_device+3−3
@@ -69,18 +69,18 @@ sync_code() {
69}
69}
70
70
71build() {
71build() {
72− exec_with_ssh $SUDO mk-build-deps -B -i $CODE_DIR/debian/control
72+ exec_with_ssh "$SUDO mk-build-deps --tool=\\\"apt-get -y --no-install-recommends\\\" --build-dep --install $CODE_DIR/debian/control"
73 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
73 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
74}
74}
75
75
76run() {
76run() {
77 SERVICEFILE="/data/ubuntu/etc/device-services"
77 SERVICEFILE="/data/ubuntu/etc/device-services"
78− adb shell "egrep "$BINARY|qml-phone-shell" $SERVICEFILE"
78+ adb shell "egrep \"$BINARY|qml-phone-shell\" $SERVICEFILE"
79 CONTAINS_SHELL=$?
79 CONTAINS_SHELL=$?
80 if [ $CONTAINS_SHELL -eq 0 ]; then
80 if [ $CONTAINS_SHELL -eq 0 ]; then
81 echo "Modifying $SERVICEFILE on device. Old contents will be saved in $SERVICEFILE.backup"
81 echo "Modifying $SERVICEFILE on device. Old contents will be saved in $SERVICEFILE.backup"
82 adb shell cp $SERVICEFILE $SERVICEFILE.backup
82 adb shell cp $SERVICEFILE $SERVICEFILE.backup
83− adb shell sed -i /$BINARY|qml-phone-shell/d $SERVICEFILE
83+ adb shell sed -i "/$BINARY\|qml-phone-shell/d" $SERVICEFILE
84 adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
84 adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
85 fi
85 fi
86 adb shell pkill $BINARY
86 adb shell pkill $BINARY