diff options
| author | Jess Robinson <castaway@desert-island.me.uk> | 2013-04-29 09:54:35 +0100 |
|---|---|---|
| committer | Brian Fraser <fraserbn@gmail.com> | 2014-01-26 14:44:19 -0300 |
| commit | 31b9cdb1c8112732af70d17a569811568f2bead1 (patch) | |
| tree | f4c7b06162c4e540b3d4142e150b8165811d41d8 /hints | |
| parent | 19abaf5c0cfc9d2967c43999e14f952574f0fced (diff) | |
| download | perl-31b9cdb1c8112732af70d17a569811568f2bead1.tar.gz | |
Android hints, run-ssh: Make sure that the stdout of commands run from Configure and Makefile on remote hosts is transfered back correctly
Diffstat (limited to 'hints')
| -rw-r--r-- | hints/linux-android.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hints/linux-android.sh b/hints/linux-android.sh index fdef9ed36c..f5b602fc15 100644 --- a/hints/linux-android.sh +++ b/hints/linux-android.sh @@ -65,11 +65,12 @@ $to \$exe > /dev/null 2>&1 # send copy results to /dev/null as otherwise it outputs speed stats which gets in our way. # sometimes there is no $?, I dunno why? we then get Cross/run-adb-shell: line 39: exit: XX: numeric argument required -foo=\`adb -s $targethost shell "sh -c '(cd \$cwd && \$env ; \$exe \$args > \$exe.stdout) ; \$doexit '"\` +foo=\`adb -s $targethost shell "sh -c '(cd \$cwd && \$env ; \$exe \$args) > $targetdir/output.stdout ; \$doexit '"\` # We get back Ok\r\n on android for some reason, grrr: -$from \$exe.stdout -result=\`cat \$exe.stdout\` -rm \$exe.stdout +$from output.stdout +result=\`cat output.stdout\` +rm output.stdout +result=\`echo \$result | sed -e 's|\r||g'\` foo=\`echo \$foo | sed -e 's|\r||g'\` # Also, adb doesn't exit with the commands exit code, like ssh does, double-grr echo "\$result" |