From e131091bbbbc4a5b2d3b3f37e33fcc593c6b4de7 Mon Sep 17 00:00:00 2001
From: Richard Kuhnt <r15ch13+git@gmail.com>
Date: Thu, 15 Mar 2018 21:13:47 +0100
Subject: [PATCH] Move zip and unzip to keybase mirror (fixes #2126)

---
 unzip.json | 11 +++++------
 zip.json   | 35 ++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/unzip.json b/unzip.json
index d2ec16bccf..5cf97c98bd 100644
--- a/unzip.json
+++ b/unzip.json
@@ -1,4 +1,8 @@
 {
+    "homepage": "http://www.info-zip.org/",
+    "license": "http://www.info-zip.org/pub/infozip/license.html",
+    "description": "Unzip compression utility",
+    "version": "6.00",
     "bin": [
         "SFXWiz32.exe",
         "unzipsfx.exe",
@@ -10,11 +14,6 @@
             "-Z"
         ]
     ],
-    "description": "Unzip compression utility",
     "hash": "7869ee36346b47701ef01efd0bc2889f970266b66c80b30f74303d50bf7fa33d",
-    "homepage": "http://www.info-zip.org/",
-    "license": "http://www.info-zip.org/pub/infozip/license.html",
-    "pre_install": "& \"$dir\\unz600xn.exe\" -d \"$dir\" -o",
-    "url": "ftp://ftp.info-zip.org/pub/infozip/win32/unz600xn.exe",
-    "version": "6.00"
+    "url": "https://r15ch13.keybase.pub/scoop/unzip/unz600xn.exe#/dl.7z"
 }
diff --git a/zip.json b/zip.json
index b88463c273..b8e2f9c87d 100644
--- a/zip.json
+++ b/zip.json
@@ -1,23 +1,28 @@
 {
-    "architecture": {
-        "32bit": {
-            "hash": "f8bbc1821d50400245107ce8cfa4a6c7b524387b58bbd6cbe9c20094e82c3bb5",
-            "url": "ftp://ftp.info-zip.org/pub/infozip/win32/zip300xn.zip"
-        },
-        "64bit": {
-            "hash": "ed29893fcd7f8b2afb2ead0461663584b740b5d064d4e1c87084107941197a7b",
-            "url": "ftp://ftp.info-zip.org/pub/infozip/win32/zip300xn-x64.zip"
-        }
-    },
+    "homepage": "http://www.info-zip.org/",
+    "license": "http://www.info-zip.org/pub/infozip/license.html",
+    "description": "Zip compression utilities",
+    "version": "3.0",
     "bin": [
         "zip.exe",
         "zipcloak.exe",
         "zipnote.exe",
         "zipsplit.exe"
     ],
-    "description": "Zip compression utilities",
-    "homepage": "http://www.info-zip.org/",
-    "license": "http://www.info-zip.org/pub/infozip/license.html",
-    "pre_install": "Add-Type -assembly 'system.io.compression.filesystem'; [io.compression.zipfile]::ExtractToDirectory(\"$dir\\$fname\", \"$dir\")",
-    "version": "3.0"
+    "architecture": {
+        "32bit": {
+            "hash": "f8bbc1821d50400245107ce8cfa4a6c7b524387b58bbd6cbe9c20094e82c3bb5",
+            "url": "https://r15ch13.keybase.pub/scoop/zip/zip300xn.zip"
+        },
+        "64bit": {
+            "hash": "ed29893fcd7f8b2afb2ead0461663584b740b5d064d4e1c87084107941197a7b",
+            "url": "https://r15ch13.keybase.pub/scoop/zip/zip300xn-x64.zip"
+        }
+    },
+    "pre_install": [
+        "if(Test-Path \"$dir\\zip300xn-x64.zip\") {",
+        "unzip \"$dir\\zip300xn-x64.zip\" \"$dir\"",
+        "Remove-Item \"$dir\\zip300xn-x64.zip\"",
+        "}"
+    ]
 }