summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git-annex.cabal2
-rwxr-xr-xstandalone/android/runshell6
2 files changed, 4 insertions, 4 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 7953b5958..938b45638 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -8,7 +8,7 @@ Stability: Stable
Copyright: 2010-2013 Joey Hess
License-File: COPYRIGHT
Homepage: http://git-annex.branchable.com/
-Build-type: Simple
+Build-type: Custom
Category: Utility
Synopsis: manage files with git, without checking their contents into git
Description:
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"