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

shorter directory to external ssh socket

Browse source 
Before it was too long to be used.
This commit is contained in:
Joey Hess 2013-02-19 17:31:08 -04:00
parent 624e34649f
commit 00b465e213
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Annex/Ssh.hs
View file

@ -77,12 +77,9 @@ sshCacheDir
| otherwise = return Nothing | otherwise = return Nothing
where where
gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR" gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR"
usetmpdir tmpdir = do usetmpdir tmpdir = liftIO $ catchMaybeIO $ do
u <- getUUID createDirectoryIfMissing True tmpdir
let dir = tmpdir </> fromUUID u return $ tmpdir
liftIO $ catchMaybeIO $ do
createDirectoryIfMissing True dir
return $ dir
portParams :: Maybe Integer -> [CommandParam] portParams :: Maybe Integer -> [CommandParam]
portParams Nothing = [] portParams Nothing = []

6
standalone/android/runshell
View file

@ -4,7 +4,8 @@
set -e set -e
base="$(dirname $0)"/git-annex-bundle here="$(dirname $0)"
base="$here/git-annex-bundle"
if [ ! -d "$base" ]; then if [ ! -d "$base" ]; then
echo "** cannot find base directory (I seem to be $0)" >&2 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 export GIT_ANNEX_STANDLONE_ENV
# This is a temporary directory on a non-crippled filesystem. # 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 export GIT_ANNEX_TMP_DIR
mkdir -p "$GIT_ANNEX_TMP_DIR" mkdir -p "$GIT_ANNEX_TMP_DIR"