From 12dc05471db63aa4b3d59a78dab9882e51e33b53 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Mon, 18 Nov 2019 02:50:00 +0800
Subject: [PATCH] gpg: Use portable configuration (#318)

* Update gnupg.json

* Update gpg.json

* Update gpg.json

* Update gnupg.json
---
 bucket/gnupg.json | 14 ++++++++++++--
 bucket/gpg.json   | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/bucket/gnupg.json b/bucket/gnupg.json
index c9c50bc572..864f695857 100644
--- a/bucket/gnupg.json
+++ b/bucket/gnupg.json
@@ -5,11 +5,21 @@
     "version": "2.2.17",
     "license": "GPL-3.0-or-later",
     "url": "https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-2.2.17_20190709.exe#/dl.7z",
-    "hash": "e5c99867591c1f72190f5540040ba027233f8cf5acc9ed627dba89a2461b57e0",
+    "hash": "sha1:82abfbc79d1a99b27f25ba92fe878cad07a31532",
+    "pre_install": [
+        "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\gnupg-uninstall.exe.nsis\" -Force -Recurse",
+        "New-Item \"$dir\\bin\\gpgconf.ctl\" -Force | Out-Null",
+        "if (!(Test-Path \"$persist_dir\\home\") -and (Test-Path \"$env:Appdata\\gnupg\")) {",
+        "    Write-Host -F yellow \"Copying old '$env:Appdata\\gnupg' to '$persist_dir\\home'\"",
+        "    New-Item \"$dir\\home\" -ItemType Directory -Force | Out-Null",
+        "    Copy-Item \"$env:Appdata\\gnupg\\*\" \"$dir\\home\" -Recurse -Force",
+        "}"
+    ],
     "env_add_path": "bin",
+    "persist": "home",
     "checkver": {
         "url": "https://www.gnupg.org/download/index.html",
-        "re": "gnupg-w32-(?<version>[\\d.]+)_(?<date>[\\d]{8}).exe"
+        "regex": "gnupg-w32-([\\d.]+)_(?<date>\\d+)\\.exe"
     },
     "autoupdate": {
         "url": "https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-$version_$matchDate.exe#/dl.7z",
diff --git a/bucket/gpg.json b/bucket/gpg.json
index e972e29df7..45957219b2 100644
--- a/bucket/gpg.json
+++ b/bucket/gpg.json
@@ -6,16 +6,26 @@
     "license": "GPL-3.0-or-later",
     "url": "https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-2.2.17_20190709.exe#/dl.7z",
     "hash": "sha1:82abfbc79d1a99b27f25ba92fe878cad07a31532",
+    "pre_install": [
+        "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\gnupg-uninstall.exe.nsis\" -Force -Recurse",
+        "New-Item \"$dir\\bin\\gpgconf.ctl\" -Force | Out-Null",
+        "if (!(Test-Path \"$persist_dir\\home\") -and (Test-Path \"$env:Appdata\\gnupg\")) {",
+        "    Write-Host -F yellow \"Copying old '$env:Appdata\\gnupg' to '$persist_dir\\home'\"",
+        "    New-Item \"$dir\\home\" -ItemType Directory -Force | Out-Null",
+        "    Copy-Item \"$env:Appdata\\gnupg\\*\" \"$dir\\home\" -Recurse -Force",
+        "}"
+    ],
     "env_add_path": "bin",
+    "persist": "home",
     "checkver": {
         "url": "https://www.gnupg.org/download/index.html",
-        "re": "gnupg-w32-(?<version>[\\d.]+)_(?<date>[\\d]{8}).exe"
+        "regex": "gnupg-w32-([\\d.]+)_(?<date>\\d+)\\.exe"
     },
     "autoupdate": {
         "url": "https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-$version_$matchDate.exe#/dl.7z",
         "hash": {
             "url": "https://www.gnupg.org/download/integrity_check.html",
-            "regex": "$sha1.*$basename"
+            "regex": "$sha1\\s+$basename"
         }
     }
 }