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

Better fix for standalone tarball git-annex sync linker shim bug, that works for "git annex sync" as well as "git-annex sync".

Browse source
This commit is contained in:
Joey Hess 2015-03-27 16:06:50 -04:00
parent 48bc2b9e54
commit 00b07d7155
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Build/LinuxMkLibs.hs
View file

@ -69,6 +69,8 @@ installLinkerShim top linker exe = do
createSymbolicLink link (top </> exelink) createSymbolicLink link (top </> exelink)
writeFile exe $ unlines writeFile exe $ unlines
[ "#!/bin/sh" [ "#!/bin/sh"
, "GIT_ANNEX_PROGRAMPATH=\"$0\""
, "export GIT_ANNEX_PROGRAMPATH"
, "exec \"$GIT_ANNEX_DIR/" ++ exelink ++ "\" --library-path \"$GIT_ANNEX_LD_LIBRARY_PATH\" \"$GIT_ANNEX_DIR/shimmed/" ++ base ++ "/" ++ base ++ "\" \"$@\"" , "exec \"$GIT_ANNEX_DIR/" ++ exelink ++ "\" --library-path \"$GIT_ANNEX_LD_LIBRARY_PATH\" \"$GIT_ANNEX_DIR/shimmed/" ++ base ++ "/" ++ base ++ "\" \"$@\""
] ]
modifyFileMode exe $ addModes executeModes modifyFileMode exe $ addModes executeModes

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
git-annex (5.20150328) UNRELEASED; urgency=medium
* Better fix for standalone tarball git-annex sync linker shim bug,
that works for "git annex sync" as well as "git-annex sync".
-- Joey Hess <id@joeyh.name> Fri, 27 Mar 2015 16:04:43 -0400
git-annex (5.20150327) unstable; urgency=medium git-annex (5.20150327) unstable; urgency=medium
* readpresentkey: New plumbing command for checking location log. * readpresentkey: New plumbing command for checking location log.

3
standalone/linux/skel/git-annex
View file

@ -28,7 +28,4 @@ if [ -e "$base/bin/git-annex" ]; then
export GIT_ANNEX_APP_BASE export GIT_ANNEX_APP_BASE
fi fi
GIT_ANNEX_PROGRAMPATH="$0"
export GIT_ANNEX_PROGRAMPATH
exec "$base/runshell" git-annex "$@" exec "$base/runshell" git-annex "$@"