diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-28 19:12:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-28 19:12:54 -0400 |
| commit | b9e4f361b7cd5f4d14ebe670c37f497fa0526167 (patch) | |
| tree | b2670e329eb2e2d24dabcc6014d53e7802ddea66 | |
| parent | 3c8750beddd82e6352a462c7f4a9638355920b64 (diff) | |
fix 2 bugs in android runshell
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 2 | ||||
| -rw-r--r-- | standalone/android/Makefile | 2 | ||||
| -rwxr-xr-x | standalone/android/runshell | 4 |
4 files changed, 5 insertions, 5 deletions
@@ -165,7 +165,5 @@ android: androidapp: $(MAKE) android $(MAKE) -C standalone/android - mkdir -p tmp - cp standalone/android/source/term/bin/Term-debug.apk tmp/git-annex.apk .PHONY: git-annex tags 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/Makefile b/standalone/android/Makefile index e7e25622c..f62268754 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -76,6 +76,8 @@ build: start git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && ant debug + mkdir -p ../../tmp + cp $(GIT_ANNEX_ANDROID_SOURCETREE)/term/bin/Term-debug.apk ../../tmp/git-annex.apk $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl: cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && CC=$$(which cc) ./Configure android diff --git a/standalone/android/runshell b/standalone/android/runshell index 5c0952721..2b1426e51 100755 --- a/standalone/android/runshell +++ b/standalone/android/runshell @@ -54,7 +54,7 @@ buildtree () { } install () { - if $cmd test ! -e "$base/git-annex"; then + if $cmd test ! -e "$base/bin/git-annex"; then if ! $cmd mkdir -p "$HOME"; then $cmd echo "mkdir of $HOME failed!" fi @@ -100,7 +100,7 @@ run () { shift 1 exec "$cmd" "$@" else - if $cmd test -e "$HOME/.config/git-annex/autostart; then + if $cmd test -e "$HOME/.config/git-annex/autostart"; then git annex assistant --autostart || $cmd true fi /system/bin/sh |