summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-02-28 19:18:56 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-02-28 19:18:56 -0400
commit6a70c36df185358e145117e61619064cf0377f5f (patch)
tree4b9c23c9603c7652cd0e3930b17ddbc796520b7d /standalone
parent57d911fb85a6dd9d3ab2c00f660fabd3beab7f62 (diff)
fix android app upgrade hang
rm was blocked waiting for input
Diffstat (limited to 'standalone')
-rwxr-xr-xstandalone/android/runshell6
1 files changed, 3 insertions, 3 deletions
diff --git a/standalone/android/runshell b/standalone/android/runshell
index 2b1426e51..1e5ec1b73 100755
--- a/standalone/android/runshell
+++ b/standalone/android/runshell
@@ -25,7 +25,7 @@ buildtree () {
for prog in busybox git-annex git-shell git-upload-pack git gpg rsync ssh ssh-keygen; do
$cmd echo "installing $prog"
if $cmd test -e "$base/bin/$prog"; then
- $cmd rm "$base/bin/$prog"
+ $cmd rm -f "$base/bin/$prog"
fi
$cmd ln "$base/lib/lib.$prog.so" "$base/bin/$prog"
done
@@ -39,11 +39,11 @@ buildtree () {
for link in $($cmd cat "$base/links/$prog"); do
$cmd echo "linking $link to $prog"
if $cmd test -e "$base/$link"; then
- $cmd rm "$base/$link"
+ $cmd rm -f "$base/$link"
fi
$cmd ln "$base/bin/$prog" "$base/$link"
done
- $cmd rm "$base/links/$prog"
+ $cmd rm -f "$base/links/$prog"
done
$cmd mkdir -p "$base/templates"