Changes for gnupg 2.3.2

rupor-github · Aug 25, 2021 · 994c461 · 994c461
1 parent dbf96a4
commit 994c461
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,7 +57,7 @@ endif()
 # Project version number
 set(PRJ_VERSION_Major "1")
 set(PRJ_VERSION_Minor "3")
-set(PRJ_VERSION_Patch "1")
+set(PRJ_VERSION_Patch "2")
 
 if (EXISTS "${PROJECT_SOURCE_DIR}/.git" AND IS_DIRECTORY "${PROJECT_SOURCE_DIR}/.git")
     execute_process(COMMAND ${CMAKE_SOURCE_DIR}/cmake/githash.sh ${GIT_EXECUTABLE}

diff --git a/cmake/win-gpg-agent.json.in b/cmake/win-gpg-agent.json.in
@@ -22,7 +22,10 @@
         "if (!(Test-Path \"$dir\\agent-gui.conf\")) {",
         "  $content = \"gpg:`r`n\"",
         "  $content += \"  install_path: \"\"`$`{USERPROFILE`}\\\\scoop\\\\apps\\\\gnupg\\\\current\"\"`r`n\"",
-        "  $content += \"  homedir: \"\"`$`{USERPROFILE`}\\\\scoop\\\\apps\\\\gnupg\\\\current\\\\home\"\"`r`n\"",
+        "  $content += \"  # Before gnupg 2.3.2 release home directory could be properly link-ed`r`n\"",
+        "  $content += \"  #   homedir: \"\"`$`{USERPROFILE`}\\\\scoop\\\\apps\\\\gnupg\\\\current\\\\home\"\"`r`n\"",
+        "  $content += \"  # After gnupg 2.3.2 release (due to the changes in T5537) use this one instead`r`n\"",
+        "  $content += \"  homedir: \"\"`$`{USERPROFILE`}\\\\scoop\\\\persist\\\\gnupg\\\\home\"\"`r`n\"",
         "  $content += \"gui:`r`n\"",
         "  $content += \"  debug: false`r`n\"",
         "  $content += \"  setenv: true`r`n\"",