Merge lp:~paulliu/unity8/fix_run_on_devices_script_20140930 into lp:unity8

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Michael Terry
Approved revision: 1303
Merge reported by: Michał Sawicz
Merged at revision: not available
Proposed branch: lp:~paulliu/unity8/fix_run_on_devices_script_20140930
Merge into: lp:unity8
Diff against target: 18 lines (+4/-5)
1 file modified
run_on_device.sh (+4/-5)
To merge this branch: bzr merge lp:~paulliu/unity8/fix_run_on_devices_script_20140930
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Terry Approve
Review via email: mp+236706@code.launchpad.net

Commit message

Fix run_on_device.sh to let it run again.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
None.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.
 * Did you make sure that your branch does not contain spurious tags?
Yes.
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A.
 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Michael Terry (mterry) wrote :

I think this needs an additional fix. You'll notice that if you run it now, the rm call at the end can't find the file. And if you try to print the PASSFILE var, you get weird output.

Apparently 'adb shell' is including a return character (\r) as if it were in DOS. An easy fix is to make the line look like:

PASSFILE=$(adb shell 'mktemp' | tr -d '\r')

review: Needs Fixing
1303. By Ying-Chun Liu on 2014-10-08

fix trailing \r

Michael Terry (mterry) wrote :

Looks good now!

review: Approve
Michael Terry (mterry) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 Yes

 * Did CI run pass? If not, please explain why.
 No, for unrelated reasons

 * Did you make sure that the branch does not contain spurious tags?
 Yes

1304. By Ying-Chun Liu on 2014-10-09

merge trunk

Michał Sawicz (saviq) wrote :

This got merged, bar the last "merge" commit.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run_on_device.sh'
2--- run_on_device.sh 2014-09-10 11:31:51 +0000
3+++ run_on_device.sh 2014-10-09 14:40:27 +0000
4@@ -130,11 +130,10 @@
5 usage
6 fi
7
8-PASSFILE=$( adb shell "FILE=\`mktemp\`
9- echo \"#!/bin/sh\" > \$FILE
10- echo \"echo \\\"${PASSWORD}\\\"\" >> \$FILE
11- chmod +x \$FILE
12- echo \$FILE" | tr -d '\r' )
13+PASSFILE=$(adb shell 'mktemp' | tr -d '\r')
14+adb shell "echo '#!/bin/sh' > ${PASSFILE}"
15+adb shell "echo \"echo \\\"${PASSWORD}\\\"\" >> ${PASSFILE}"
16+adb shell "chmod +x ${PASSFILE}"
17
18 setup_adb_forwarding
19

Subscribers

People subscribed via source and target branches