diff options
| author | Joey Hess <joeyh@joeyh.name> | 2019-11-14 16:15:42 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2019-11-14 16:15:42 -0400 |
| commit | f037ad92ec5b73543a0527de61e6f6f0fcbb821b (patch) | |
| tree | 39b0aa3a041c49894e551d45981e70bdd5fd2e60 | |
| parent | 28733a3f5a060e8170ebe3dfe1c74224f23803b2 (diff) | |
OSX git-annex.app: Fix a regression that broke git-remote-https, git-remote-http, and git-shell
Putting the binaries in bundle/git-core/bin didn't work on OSX,
linker can't find the libraries next to those binaries where it expects to.
So instead put the binaries in the progDir.
| -rw-r--r-- | Build/Standalone.hs | 12 | ||||
| -rw-r--r-- | CHANGELOG | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Build/Standalone.hs b/Build/Standalone.hs index e02e70a669..c0a867d0a5 100644 --- a/Build/Standalone.hs +++ b/Build/Standalone.hs @@ -58,8 +58,9 @@ installGitLibs topdir = do -- many git-core files may symlink to eg -- ../../bin/git, which is located outside -- the git-core directory. The target of - -- such links is installed into a bin - -- directory, and the links repointed to it. + -- such links is installed into the progDir + -- (if not already there), and the links + -- repointed to it. -- -- Other git-core files symlink to a file -- beside them in the directory. Those @@ -68,9 +69,10 @@ installGitLibs topdir = do if takeFileName linktarget == linktarget then cp f destf else do - let linktarget' = gitcoredestdir </> "bin" </> takeFileName linktarget - createDirectoryIfMissing True (takeDirectory linktarget') - L.readFile f >>= L.writeFile linktarget' + let linktarget' = progDir topdir + unlessM (doesFileExist linktarget') $ do + createDirectoryIfMissing True (takeDirectory linktarget') + L.readFile f >>= L.writeFile linktarget' nukeFile destf rellinktarget <- relPathDirToFile (takeDirectory destf) linktarget' createSymbolicLink rellinktarget destf @@ -6,6 +6,8 @@ git-annex (7.20191107) UNRELEASED; urgency=medium * Fix a crash (STM deadlock) when -J is used with multiple files that point to the same key. * linuxstandalone: Fix a regression that broke git-remote-https. + * OSX git-annex.app: Fix a regression that broke git-remote-https, + git-remote-http, and git-shell. -- Joey Hess <id@joeyh.name> Mon, 11 Nov 2019 15:59:47 -0400 |