mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix android app upgrade hang

Browse source 
rm was blocked waiting for input
This commit is contained in:
Joey Hess 2013-02-28 19:18:56 -04:00
parent 323aaac805
commit 422928394e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-annex.cabal
View file

@ -8,7 +8,7 @@ Stability: Stable
Copyright: 2010-2013 Joey Hess Copyright: 2010-2013 Joey Hess
License-File: COPYRIGHT License-File: COPYRIGHT
Homepage: http://git-annex.branchable.com/ Homepage: http://git-annex.branchable.com/
Build-type: Simple Build-type: Custom
Category: Utility Category: Utility
Synopsis: manage files with git, without checking their contents into git Synopsis: manage files with git, without checking their contents into git
Description: Description:

6
standalone/android/runshell
View file

@ -25,7 +25,7 @@ buildtree () {
for prog in busybox git-annex git-shell git-upload-pack git gpg rsync ssh ssh-keygen; do for prog in busybox git-annex git-shell git-upload-pack git gpg rsync ssh ssh-keygen; do
$cmd echo "installing $prog" $cmd echo "installing $prog"
if $cmd test -e "$base/bin/$prog"; then if $cmd test -e "$base/bin/$prog"; then
$cmd rm "$base/bin/$prog" $cmd rm -f "$base/bin/$prog"
fi fi
$cmd ln "$base/lib/lib.$prog.so" "$base/bin/$prog" $cmd ln "$base/lib/lib.$prog.so" "$base/bin/$prog"
done done
@ -39,11 +39,11 @@ buildtree () {
for link in $($cmd cat "$base/links/$prog"); do for link in $($cmd cat "$base/links/$prog"); do
$cmd echo "linking $link to $prog" $cmd echo "linking $link to $prog"
if $cmd test -e "$base/$link"; then if $cmd test -e "$base/$link"; then
$cmd rm "$base/$link" $cmd rm -f "$base/$link"
fi fi
$cmd ln "$base/bin/$prog" "$base/$link" $cmd ln "$base/bin/$prog" "$base/$link"
done done
$cmd rm "$base/links/$prog" $cmd rm -f "$base/links/$prog"
done done
$cmd mkdir -p "$base/templates" $cmd mkdir -p "$base/templates"