Merge #23

23: Fix template directory r=DilumAluthge a=DilumAluthge

Fixes #22 

Co-authored-by: Dilum Aluthge <[email protected]>

Author: bcbi-bot

Project.toml

@@ -1,7 +1,7 @@
 name = "GitCommand"
 uuid = "49b5b516-ca3f-4003-a081-42bdcf55082d"
 authors = ["Dilum Aluthge", "Brown Center for Biomedical Informatics"]
-version = "0.1.1"
+version = "0.1.2"
 
 [deps]
 Git_jll = "f8c6e375-362e-5223-8a59-34ff63f689eb"

src/env_mapping.jl

@@ -16,17 +16,28 @@ function _env_mapping(; adjust_PATH::Bool = true,
     end
     git_path, env_mapping = Git_jll.git(; adjust_PATH = adjust_PATH,
                                           adjust_LIBPATH = adjust_LIBPATH) do git_path
-        git_core = joinpath(dirname(dirname(git_path)), "libexec", "git-core")
+        sep = _separator()
+    
+        root = dirname(dirname(git_path))
+        
+        libexec = joinpath(root, "libexec")
+        libexec_git_core = joinpath(libexec, "git-core")
+        
+        share = joinpath(root, "share")
+        share_git_core = joinpath(share, "git-core")
+        share_git_core_templates = joinpath(share_git_core, "templates")
+        
         libcurlpath = dirname(Git_jll.LibCURL_jll.libcurl_path)
         originallibpath = get(ENV, Git_jll.LIBPATH_env, "")
+        newlibpath = "$(libcurlpath)$(sep)$(originallibpath)"
+        
         ssl_cert = joinpath(dirname(Sys.BINDIR), "share", "julia", "cert.pem")
 
-        sep = _separator()
-
         env_mapping = Dict{String,String}()
-        env_mapping["GIT_EXEC_PATH"] = git_core
+        env_mapping["GIT_EXEC_PATH"] = libexec_git_core
         env_mapping["GIT_SSL_CAINFO"] = ssl_cert
-        env_mapping[Git_jll.LIBPATH_env] = "$(libcurlpath)$(sep)$(originallibpath)"
+        env_mapping["GIT_TEMPLATE_DIR"] = share_git_core_templates
+        env_mapping[Git_jll.LIBPATH_env] = newlibpath
         if haskey(ENV, "PATH")
             env_mapping["PATH"] = ENV["PATH"]
         end