From a5c054ea9ee6906a7c81499c11ea2a701587a554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my?= <git@rrelmy.ch>
Date: Sun, 1 Jan 2017 17:30:18 +0100
Subject: [PATCH] Breaking, change autoupdate definition to use the same logic
 as the architecture by the core / update the affected manifests / ability to
 change extract_dir based on arch / add nssm autoupdate

---
 caddy.json       | 10 ++++++---
 curl.json        | 14 +++++++-----
 go.json          | 10 ++++++---
 imagemagick.json | 10 ++++++---
 nodejs-lts.json  | 10 ++++++---
 nodejs.json      | 10 ++++++---
 nssm.json        | 58 +++++++++++++++++++++++++++++++-----------------
 php-nts.json     | 10 ++++++---
 php.json         | 10 ++++++---
 pt.json          | 10 ++++++---
 10 files changed, 103 insertions(+), 49 deletions(-)

diff --git a/caddy.json b/caddy.json
index a3fad7f146..8165d2d4ff 100644
--- a/caddy.json
+++ b/caddy.json
@@ -29,9 +29,13 @@
         "re": "/releases/tag/v([\\d.]+)"
     },
     "autoupdate": {
-        "url": {
-            "64bit": "https://github.com/mholt/caddy/releases/download/v$version/caddy_windows_amd64.zip",
-            "32bit": "https://github.com/mholt/caddy/releases/download/v$version/caddy_windows_386.zip"
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/mholt/caddy/releases/download/v$version/caddy_windows_amd64.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/mholt/caddy/releases/download/v$version/caddy_windows_386.zip"
+            }
         },
         "hash": {
             "mode": "download"
diff --git a/curl.json b/curl.json
index c178c3073b..1a1e36cebf 100644
--- a/curl.json
+++ b/curl.json
@@ -14,13 +14,17 @@
     },
     "bin": "curl.exe",
     "checkver": {
-      "url": "https://curl.haxx.se/download.html",
-      "re": "curl ([\\d.]+)"
+        "url": "https://curl.haxx.se/download.html",
+        "re": "curl ([\\d.]+)"
     },
     "autoupdate": {
-        "url": {
-            "64bit": "http://winampplugins.co.uk/curl/curl_$underscoreVersion_openssl_nghttp2_x64.7z",
-            "32bit": "http://winampplugins.co.uk/curl/curl_$underscoreVersion_openssl_nghttp2_x86.7z"
+        "architecture": {
+            "64bit": {
+                "url": "http://winampplugins.co.uk/curl/curl_$underscoreVersion_openssl_nghttp2_x64.7z"
+            },
+            "32bit": {
+                "url": "http://winampplugins.co.uk/curl/curl_$underscoreVersion_openssl_nghttp2_x86.7z"
+            }
         },
         "hash": {
             "mode": "download"
diff --git a/go.json b/go.json
index 7bdd689de1..d695cb1bc7 100644
--- a/go.json
+++ b/go.json
@@ -19,9 +19,13 @@
     },
     "checkver": "Build version go([\\d\\.]+)\\.",
     "autoupdate": {
-        "url": {
-            "64bit": "https://storage.googleapis.com/golang/go$version.windows-amd64.zip",
-            "32bit": "https://storage.googleapis.com/golang/go$version.windows-386.zip"
+        "architecture": {
+            "64bit": {
+                "url": "https://storage.googleapis.com/golang/go$version.windows-amd64.zip"
+            },
+            "32bit": {
+                "url": "https://storage.googleapis.com/golang/go$version.windows-386.zip"
+            }
         },
         "hash": {
             "mode": "extract",
diff --git a/imagemagick.json b/imagemagick.json
index ebe5a4f320..f047afe1a7 100644
--- a/imagemagick.json
+++ b/imagemagick.json
@@ -30,9 +30,13 @@
     ],
     "checkver": "The current release is ImageMagick <a.*?>([0-9\\.p-]+)</a>",
     "autoupdate": {
-        "url": {
-            "64bit": "https://www.imagemagick.org/download/binaries/ImageMagick-$version-portable-Q16-x64.zip",
-            "32bit": "https://www.imagemagick.org/download/binaries/ImageMagick-$version-portable-Q16-x86.zip"
+        "architecture": {
+            "64bit": {
+                "url": "https://www.imagemagick.org/download/binaries/ImageMagick-$version-portable-Q16-x64.zip"
+            },
+            "32bit": {
+                "url": "https://www.imagemagick.org/download/binaries/ImageMagick-$version-portable-Q16-x86.zip"
+            }
         },
         "hash": {
             "mode": "rdf",
diff --git a/nodejs-lts.json b/nodejs-lts.json
index ef3991a1b3..9eeac23aae 100644
--- a/nodejs-lts.json
+++ b/nodejs-lts.json
@@ -22,9 +22,13 @@ npm update -g",
         "re": "LTS version: <strong>v([\\d.]+)</strong>"
     },
     "autoupdate": {
-        "url": {
-            "64bit": "https://nodejs.org/dist/v$version/node-v$version-x64.msi",
-            "32bit": "https://nodejs.org/dist/v$version/node-v$version-x86.msi"
+        "architecture": {
+            "64bit": {
+                "url": "https://nodejs.org/dist/v$version/node-v$version-x64.msi"
+            },
+            "32bit": {
+                "url": "https://nodejs.org/dist/v$version/node-v$version-x86.msi"
+            }
         },
         "hash": {
             "mode": "extract",
diff --git a/nodejs.json b/nodejs.json
index 6cf5943b03..219e099307 100644
--- a/nodejs.json
+++ b/nodejs.json
@@ -22,9 +22,13 @@ npm update -g",
         "re": "Current version: <strong>v([\\d.]+)</strong>"
     },
     "autoupdate": {
-        "url": {
-            "64bit": "https://nodejs.org/dist/v$version/node-v$version-x64.msi",
-            "32bit": "https://nodejs.org/dist/v$version/node-v$version-x86.msi"
+        "architecture": {
+            "64bit": {
+                "url": "https://nodejs.org/dist/v$version/node-v$version-x64.msi"
+            },
+            "32bit": {
+                "url": "https://nodejs.org/dist/v$version/node-v$version-x86.msi"
+            }
         },
         "hash": {
             "mode": "extract",
diff --git a/nssm.json b/nssm.json
index b5d5c99873..3f0d1a28d0 100644
--- a/nssm.json
+++ b/nssm.json
@@ -1,23 +1,41 @@
 {
-  "homepage": "https://nssm.cc",
-  "version": "2.24",
-  "url": "https://nssm.cc/release/nssm-2.24.zip",
-  "hash": "727d1e42275c605e0f04aba98095c38a8e1e46def453cdffce42869428aa6743",
-  "architecture": {
-    "64bit": {
-      "extract_dir": "nssm-2.24/win64"
+    "homepage": "https://nssm.cc",
+    "version": "2.24",
+    "url": "https://nssm.cc/release/nssm-2.24.zip",
+    "hash": "727d1e42275c605e0f04aba98095c38a8e1e46def453cdffce42869428aa6743",
+    "architecture": {
+        "64bit": {
+            "extract_dir": "nssm-2.24/win64"
+        },
+        "32bit": {
+            "extract_dir": "nssm-2.24/win32"
+        }
     },
-    "32bit": {
-      "extract_dir": "nssm-2.24/win32"
-    }
-  },
-  "bin": [
-    "nssm.exe",
-    ["nssm.exe", "service"]
-  ],
-  "checkver": {
-    "re": "<a href=\"/release/nssm-([\\d.]+)\\.zip\"",
-    "url": "https://nssm.cc/download"
-  },
-  "notes": "Manage Services with NSSM (GUI based) (e.g., 'nssm install nginx' to install nginx as service gui will popup or 'nssm start/status/stop apache').\nVisit https://nssm.cc/commands for more info"
+    "bin": [
+        "nssm.exe",
+        [
+            "nssm.exe",
+            "service"
+        ]
+    ],
+    "checkver": {
+        "re": "<a href=\"/release/nssm-([\\d.]+)\\.zip\"",
+        "url": "https://nssm.cc/download"
+    },
+    "autoupdate": {
+        "url": "https://nssm.cc/release/nssm-$version.zip",
+        "architecture": {
+            "64bit": {
+                "extract_dir": "nssm-$version/win64"
+            },
+            "32bit": {
+                "extract_dir": "nssm-$version/win32"
+            }
+        },
+        "hash": {
+            "mode": "download"
+        }
+    },
+    "notes": "Manage Services with NSSM (GUI based) (e.g., 'nssm install nginx' to install nginx as service gui will popup or 'nssm start/status/stop apache').
+Visit https://nssm.cc/commands for more info"
 }
diff --git a/php-nts.json b/php-nts.json
index 5d8211e2a9..176be9decf 100644
--- a/php-nts.json
+++ b/php-nts.json
@@ -22,9 +22,13 @@
         "re": "<h3 id=\"php-7.1\".*?>.*?\\(([\\d.]+)\\)</h3>"
     },
     "autoupdate": {
-        "url": {
-            "64bit": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x64.zip",
-            "32bit": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x86.zip"
+        "architecture": {
+            "64bit": {
+                "url": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x64.zip"
+            },
+            "32bit": {
+                "url": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x86.zip"
+            }
         },
         "hash": {
             "mode": "extract",
diff --git a/php.json b/php.json
index 122d012089..4e2d68c19c 100644
--- a/php.json
+++ b/php.json
@@ -43,9 +43,13 @@ cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"
         "re": "<h3 id=\"php-7.1\".*?>.*?\\(([\\d.]+)\\)</h3>"
     },
     "autoupdate": {
-        "url": {
-            "64bit": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x64.zip",
-            "32bit": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x86.zip"
+        "architecture": {
+            "64bit": {
+                "url": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x64.zip"
+            },
+            "32bit": {
+                "url": "http://windows.php.net/downloads/releases/php-$version-Win32-VC14-x86.zip"
+            }
         },
         "hash": {
             "mode": "extract",
diff --git a/pt.json b/pt.json
index 79cbba7e50..a830b1b066 100644
--- a/pt.json
+++ b/pt.json
@@ -18,9 +18,13 @@
         "re": "/releases/tag/v([\\d.]+)"
     },
     "autoupdate": {
-        "url": {
-            "64bit": "https://github.com/monochromegane/the_platinum_searcher/releases/download/v$version/pt_windows_amd64.zip",
-            "32bit": "https://github.com/monochromegane/the_platinum_searcher/releases/download/v$version/pt_windows_386.zip"
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/monochromegane/the_platinum_searcher/releases/download/v$version/pt_windows_amd64.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/monochromegane/the_platinum_searcher/releases/download/v$version/pt_windows_386.zip"
+            }
         },
         "hash": {
             "mode": "download"