summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-03 11:51:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-03 11:51:58 -0400
commitda6faf0f3aa315d8d3c8b83fa59bba2d3beae28a (patch)
tree244ab18b9cd1fcecea0d2f0846ce5c658f467fa3
parent581942d5c17b45d545e4a90ae488593a3236cee3 (diff)
fixes
-rwxr-xr-xstandalone/android/runshell5
1 files changed, 2 insertions, 3 deletions
diff --git a/standalone/android/runshell b/standalone/android/runshell
index 3ff9617d7..a761a5065 100755
--- a/standalone/android/runshell
+++ b/standalone/android/runshell
@@ -92,7 +92,7 @@ run () {
export GIT_ANNEX_STANDLONE_ENV
# This is a temporary directory on a non-crippled filesystem.
- # This needs to be as short a path as possible.
+ # Needs to be as short a path as possible, for ssh sockets.
GIT_ANNEX_TMP_DIR=$base/tmp
export GIT_ANNEX_TMP_DIR
@@ -111,8 +111,7 @@ run () {
cd "$HOME"
$cmd echo "Starting git-annex interface, please wait ..."
- # For some reason this needs to run in the foreground.
- $cmd nohup git annex webapp
+ $cmd nohup git-annex webapp || $cmd true
$cmd echo "The git-annex interface is no longer running."
/system/bin/sh
fi