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

fix 2 bugs in android runshell

Browse source
This commit is contained in:
Joey Hess 2013-02-28 19:12:54 -04:00
parent 967f3b14e0
commit 6a52a47193
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -165,7 +165,5 @@ android:
androidapp: androidapp:
$(MAKE) android $(MAKE) android
$(MAKE) -C standalone/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 .PHONY: git-annex tags

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:

2
standalone/android/Makefile
View file

@ -76,6 +76,8 @@ build: start
git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && ant debug 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: $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl:
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && CC=$$(which cc) ./Configure android cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && CC=$$(which cc) ./Configure android

4
standalone/android/runshell
View file

@ -54,7 +54,7 @@ buildtree () {
} }
install () { install () {
if $cmd test ! -e "$base/git-annex"; then if $cmd test ! -e "$base/bin/git-annex"; then
if ! $cmd mkdir -p "$HOME"; then if ! $cmd mkdir -p "$HOME"; then
$cmd echo "mkdir of $HOME failed!" $cmd echo "mkdir of $HOME failed!"
fi fi
@ -100,7 +100,7 @@ run () {
shift 1 shift 1
exec "$cmd" "$@" exec "$cmd" "$@"
else 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 git annex assistant --autostart || $cmd true
fi fi
/system/bin/sh /system/bin/sh