From 00b465e21306518cda9615e1f62aa35514da5eca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 19 Feb 2013 17:31:08 -0400
Subject: [PATCH] shorter directory to external ssh socket

Before it was too long to be used.
---
 Annex/Ssh.hs                | 9 +++------
 standalone/android/runshell | 6 ++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index 444d534f6a..827c40feff 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -77,12 +77,9 @@ sshCacheDir
 	| otherwise = return Nothing
   where
 	gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR"
-	usetmpdir tmpdir = do
-		u <- getUUID
-		let dir = tmpdir </> fromUUID u
-		liftIO $ catchMaybeIO $ do
-			createDirectoryIfMissing True dir
-			return $ dir
+	usetmpdir tmpdir = liftIO $ catchMaybeIO $ do
+		createDirectoryIfMissing True tmpdir
+		return $ tmpdir
 
 portParams :: Maybe Integer -> [CommandParam]
 portParams Nothing = []
diff --git a/standalone/android/runshell b/standalone/android/runshell
index 1b0b3e4f64..20738ddb07 100755
--- a/standalone/android/runshell
+++ b/standalone/android/runshell
@@ -4,7 +4,8 @@
 
 set -e
 
-base="$(dirname $0)"/git-annex-bundle
+here="$(dirname $0)"
+base="$here/git-annex-bundle"
 
 if [ ! -d "$base" ]; then
 	echo "** cannot find base directory (I seem to be $0)" >&2
@@ -54,7 +55,8 @@ GIT_ANNEX_STANDLONE_ENV="PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR"
 export GIT_ANNEX_STANDLONE_ENV
 
 # This is a temporary directory on a non-crippled filesystem.
-GIT_ANNEX_TMP_DIR=$base/tmp
+# This needs to be as short a path as possible.
+GIT_ANNEX_TMP_DIR=$here/tmp
 export GIT_ANNEX_TMP_DIR
 mkdir -p "$GIT_ANNEX_TMP_DIR"