diff options
| -rw-r--r-- | Build/LinuxMkLibs.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | standalone/linux/skel/git-annex | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs index 9e829178c..300ace69d 100644 --- a/Build/LinuxMkLibs.hs +++ b/Build/LinuxMkLibs.hs @@ -69,6 +69,8 @@ installLinkerShim top linker exe = do createSymbolicLink link (top </> exelink) writeFile exe $ unlines [ "#!/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 ++ "\" \"$@\"" ] modifyFileMode exe $ addModes executeModes diff --git a/debian/changelog b/debian/changelog index d71d48425..4577a67dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 * readpresentkey: New plumbing command for checking location log. diff --git a/standalone/linux/skel/git-annex b/standalone/linux/skel/git-annex index 8b59be23c..7fc864d87 100755 --- a/standalone/linux/skel/git-annex +++ b/standalone/linux/skel/git-annex @@ -28,7 +28,4 @@ if [ -e "$base/bin/git-annex" ]; then export GIT_ANNEX_APP_BASE fi -GIT_ANNEX_PROGRAMPATH="$0" -export GIT_ANNEX_PROGRAMPATH - exec "$base/runshell" git-annex "$@" |