aws: Update to version 2.1.16

format
ScoopInstaller · Jan 6, 2021 · f7e19ce · f7e19ce
1 parent d052409
commit f7e19ce
Show file tree

Hide file tree

Showing 23 changed files with 102 additions and 98 deletions.
diff --git a/bucket/aws.json b/bucket/aws.json
@@ -1,12 +1,12 @@
 {
-    "version": "2.1.15",
+    "version": "2.1.16",
     "description": "Unified tool to manage AWS services",
     "homepage": "https://aws.amazon.com/cli/",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://awscli.amazonaws.com/AWSCLIV2-2.1.15.msi",
-            "hash": "142253e23d885308042d2f7755f44862feacd67102874345ef77b7b357677dd3"
+            "url": "https://awscli.amazonaws.com/AWSCLIV2-2.1.16.msi",
+            "hash": "178f8e307991163be65694a3a8a4c5b982aaf9e02656b2b722541d01a48fff07"
         }
     },
     "extract_dir": "Amazon\\AWSCLIV2",

diff --git a/bucket/terraform.json b/bucket/terraform.json
@@ -1,28 +1,24 @@
 {
-    "homepage": "https://www.terraform.io",
+    "version": "0.14.3",
     "description": "Create and manage infrastructure as code using simple declarative configuration files.",
+    "homepage": "https://www.terraform.io",
     "license": "MPL-2.0",
-    "version": "0.14.3",
     "architecture": {
         "64bit": {
             "url": "https://releases.hashicorp.com/terraform/0.14.3/terraform_0.14.3_windows_amd64.zip",
             "hash": "f9b13a80c8926a773ccb052da98cca6cb45863ba4140466af7e24c0b61a073c2",
-            "installer": {
-                "script": "New-Item -ItemType Directory -Force -Path \"$Env:APPDATA\\terraform.d\\plugins\\windows_amd64\" | Out-Null"
-            }
+            "pre_install": "ensure \"$env:APPDATA\\terraform.d\\plugins\\windows_amd64\" | Out-Null"
         },
         "32bit": {
             "url": "https://releases.hashicorp.com/terraform/0.14.3/terraform_0.14.3_windows_386.zip",
             "hash": "784e838aad10ba13c4c50b0a738591e914ee5f6b1a092da89ba09e4e5b1e1877",
-            "installer": {
-                "script": "New-Item -ItemType Directory -Force -Path \"$Env:APPDATA\\terraform.d\\plugins\\windows_386\" | Out-Null"
-            }
+            "pre_install": "ensure \"$env:APPDATA\\terraform.d\\plugins\\windows_386\" | Out-Null"
         }
     },
     "bin": "terraform.exe",
     "checkver": {
         "url": "https://releases.hashicorp.com/terraform/",
-        "re": "terraform_([\\d.]+)</a>"
+        "regex": "terraform_([\\d.]+)</a>"
     },
     "autoupdate": {
         "architecture": {

diff --git a/bucket/tesseract-languages.json b/bucket/tesseract-languages.json
@@ -1,8 +1,13 @@
 {
+    "version": "4.0.0",
+    "description": "Fast integer versions of trained models for the Tesseract Open Source OCR Engine",
     "homepage": "https://github.com/tesseract-ocr/tessdata_fast",
     "license": "Apache-2.0",
-    "description": "Fast integer versions of trained models for the Tesseract Open Source OCR Engine",
-    "version": "4.0.0",
+    "notes": [
+        "This packages has overwritten the 'TESSDATA_PREFIX' environment variable with \"$dir\".",
+        "After updating \"tesseract\" please run \"scoop reset tesseract-languages\" to update the environment variable!"
+    ],
+    "depends": "tesseract",
     "url": [
         "https://github.com/tesseract-ocr/tessdata_fast/archive/4.0.0.zip",
         "https://raw.githubusercontent.com/tesseract-ocr/tessdata/d87b3cbc75555bd3282e0cadab5e159e2d468396/equ.traineddata",
@@ -14,11 +19,6 @@
         "36f772980ff17c66a767f584a0d80bf2302a1afa585c01a226c1863afcea1392"
     ],
     "extract_dir": "tessdata_fast-4.0.0",
-    "notes": [
-        "This packages has overwritten the 'TESSDATA_PREFIX' environment variable with \"$dir\".",
-        "After updating \"tesseract\" please run \"scoop reset tesseract-languages\" to update the environment variable!"
-    ],
-    "depends": "tesseract",
     "env_set": {
         "TESSDATA_PREFIX": "$dir"
     },

diff --git a/bucket/tesseract.json b/bucket/tesseract.json
@@ -1,8 +1,12 @@
 {
-    "homepage": "https://github.com/UB-Mannheim/tesseract/wiki",
-    "license": "Apache-2.0",
     "version": "5.0.0-alpha.20201127",
     "description": "Open Source OCR Engine",
+    "homepage": "https://github.com/UB-Mannheim/tesseract/wiki",
+    "license": "Apache-2.0",
+    "notes": [
+        "Recognition data files can be installed via \"scoop install tesseract-languages\"",
+        "or downloaded manually from https://github.com/tesseract-ocr/tessdata_fast"
+    ],
     "architecture": {
         "64bit": {
             "url": "https://digi.bib.uni-mannheim.de/tesseract/tesseract-ocr-w64-setup-v5.0.0-alpha.20201127.exe#/dl.7z",
@@ -42,10 +46,6 @@
         "   env \"TESSDATA_PREFIX\" $global $langdir",
         "}"
     ],
-    "notes": [
-        "Recognition data files can be installed via \"scoop install tesseract-languages\"",
-        "or downloaded manually from https://github.com/tesseract-ocr/tessdata_fast"
-    ],
     "suggest": {
         "tesseract-languages": "tesseract-languages"
     },

diff --git a/bucket/thrift.json b/bucket/thrift.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://thrift.apache.org/",
-    "description": "A software framework, for scalable cross-language services development.",
     "version": "0.13.0",
+    "description": "A software framework, for scalable cross-language services development.",
+    "homepage": "https://thrift.apache.org/",
     "license": "Apache-2.0",
     "url": "https://www-us.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe#/thrift.exe",
     "hash": "92753ef860304eb6b3fdbbb3e07ae23b30827194d3c2a072bb4cf7a65be87693",

diff --git a/bucket/tidy.json b/bucket/tidy.json
@@ -4,15 +4,15 @@
     "homepage": "http://www.html-tidy.org/",
     "license": "BSD-3-Clause",
     "architecture": {
-        "32bit": {
-            "extract_dir": "tidy-5.6.0-vc14-32b\\bin",
-            "hash": "03c8ae9359290a3523d9fd5131456e670d2bc2564fb20aed7c6456f86b8433e2",
-            "url": "https://github.com/htacg/tidy-html5/releases/download/5.6.0/tidy-5.6.0-vc14-32b.zip"
-        },
         "64bit": {
-            "extract_dir": "tidy-5.6.0-vc14-64b\\bin",
+            "url": "https://github.com/htacg/tidy-html5/releases/download/5.6.0/tidy-5.6.0-vc14-64b.zip",
             "hash": "59ac22427a3d759c72108814f6a8f0e98511b12f87744ca19e0a500a00687be8",
-            "url": "https://github.com/htacg/tidy-html5/releases/download/5.6.0/tidy-5.6.0-vc14-64b.zip"
+            "extract_dir": "tidy-5.6.0-vc14-64b\\bin"
+        },
+        "32bit": {
+            "url": "https://github.com/htacg/tidy-html5/releases/download/5.6.0/tidy-5.6.0-vc14-32b.zip",
+            "hash": "03c8ae9359290a3523d9fd5131456e670d2bc2564fb20aed7c6456f86b8433e2",
+            "extract_dir": "tidy-5.6.0-vc14-32b\\bin"
         }
     },
     "bin": "tidy.exe",

diff --git a/bucket/time.json b/bucket/time.json
@@ -1,8 +1,9 @@
 {
-    "homepage": "https://github.com/lukesampson/psutils",
-    "description": "An approximation of the Unix time command.",
     "version": "0.2018.07.25",
+    "description": "An approximation of the Unix time command.",
+    "homepage": "https://github.com/lukesampson/psutils",
     "license": "MIT",
+    "notes": "Please use 'timecmd' instead of 'time' in cmd.exe.",
     "url": "https://raw.githubusercontent.com/lukesampson/psutils/3290c04d7653ea8183a5e11d3d5a4e46716035d1/time.ps1",
     "hash": "250413758eb4845973cfd0778b58e40ec52b881f17cbe13b22afac440fb26d93",
     "bin": [
@@ -12,7 +13,6 @@
             "timecmd"
         ]
     ],
-    "notes": "Please use 'timecmd' instead of 'time' in cmd.exe.",
     "checkver": {
         "url": "https://github.com/lukesampson/psutils/commits/master/time.ps1.atom",
         "regex": "(?s)>(\\d+)-(\\d+)-(\\d+)T.*?/(?<sha>[0-9a-f]{40})",

diff --git a/bucket/tor.json b/bucket/tor.json
@@ -3,6 +3,10 @@
     "description": "Enables anonymous communication over the onion network (expert mode).",
     "homepage": "https://www.torproject.org",
     "license": "BSD-3-Clause",
+    "notes": [
+        "NOTE: You will need to configure tor before using it, as it does not come pre-configured.",
+        "Please see https://www.torproject.org/docs/tor-manual.html.en for configuration details."
+    ],
     "architecture": {
         "64bit": {
             "url": "https://dist.torproject.org/torbrowser/10.0.7/tor-win64-0.4.4.6.zip",
@@ -13,6 +17,17 @@
             "hash": "085017692959cc2cae15d0d4882edcfdd1714dc45b23097cf247bbee23a33478"
         }
     },
+    "pre_install": [
+        "$current = current_dir $dir",
+        "$content = @(",
+        "    \"DataDirectory `\"$current\\Data\\Data`\"\"",
+        "    \"GeoIPFile `\"$current\\Data\\Tor\\geoip`\"\"",
+        "    \"GeoIPv6File `\"$current\\Data\\Tor\\geoip6`\"\"",
+        ")",
+        "if (!(Test-Path \"$persist_dir\\torrc\")) {",
+        "    Add-Content \"$dir\\torrc\" $content.Replace('\\', '/') -Encoding ASCII -Force",
+        "}"
+    ],
     "bin": [
         [
             "Tor\\tor.exe",
@@ -25,17 +40,6 @@
         "Data\\Data",
         "torrc"
     ],
-    "pre_install": [
-        "$current = current_dir $dir",
-        "$content = @(",
-        "    \"DataDirectory `\"$current\\Data\\Data`\"\"",
-        "    \"GeoIPFile `\"$current\\Data\\Tor\\geoip`\"\"",
-        "    \"GeoIPv6File `\"$current\\Data\\Tor\\geoip6`\"\"",
-        ")",
-        "if (!(Test-Path \"$persist_dir\\torrc\")) {",
-        "    Add-Content \"$dir\\torrc\" $content.Replace('\\', '/') -Encoding ASCII -Force",
-        "}"
-    ],
     "checkver": {
         "url": "https://www.torproject.org/download/tor/",
         "regex": "torbrowser/(?<browser>[\\d.]+)/tor-win32-(?<version>[\\d.]+)\\.zip"
@@ -52,9 +56,5 @@
         "hash": {
             "url": "$baseurl/sha256sums-signed-build.txt"
         }
-    },
-    "notes": [
-        "NOTE: You will need to configure tor before using it, as it does not come pre-configured.",
-        "Please see https://www.torproject.org/docs/tor-manual.html.en for configuration details."
-    ]
+    }
 }
diff --git a/bucket/touch.json b/bucket/touch.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/lukesampson/psutils",
-    "description": "A port of the Unix touch command.",
     "version": "0.2018.07.25",
+    "description": "A port of the Unix touch command.",
+    "homepage": "https://github.com/lukesampson/psutils",
     "license": "MIT",
     "url": "https://raw.githubusercontent.com/lukesampson/psutils/3290c04d7653ea8183a5e11d3d5a4e46716035d1/touch.ps1",
     "hash": "11eeb18ca3143929b5ace9a838a88d9b1c5bc657bcc8dd46708ba7e50ba331d9",

diff --git a/bucket/transmission-cli.json b/bucket/transmission-cli.json
@@ -1,8 +1,8 @@
 {
     "version": "3.00",
+    "description": "A fast, easy, and free BitTorrent client.",
     "homepage": "https://transmissionbt.com/",
     "license": "GPL-2.0-only|GPL-3.0-only",
-    "description": "A fast, easy, and free BitTorrent client.",
     "architecture": {
         "64bit": {
             "url": "https://github.com/transmission/transmission-releases/raw/master/transmission-3.00-x64.msi",

diff --git a/bucket/tta.json b/bucket/tta.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://tta.tausoft.org/",
-    "description": "The True Audio lossless audio encoder/decoder",
     "version": "2.3",
+    "description": "The True Audio lossless audio encoder/decoder",
+    "homepage": "http://tta.tausoft.org/",
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {

diff --git a/bucket/tunnel.json b/bucket/tunnel.json
@@ -1,27 +1,27 @@
 {
     "version": "0.5.15",
-    "homepage": "https://github.com/labstack/tunnel-client",
     "description": "Expose local servers to the internet securely.",
+    "homepage": "https://github.com/labstack/tunnel-client",
     "license": "MIT",
     "architecture": {
-        "32bit": {
-            "url": "https://github.com/labstack/tunnel-client/releases/download/v0.5.15/tunnel_0.5.15_windows_32-bit.zip",
-            "hash": "fa2c2a376b0caa6b82b6041a118b192b79cf265a976e5648cc05bf83cb2093b9"
-        },
         "64bit": {
             "url": "https://github.com/labstack/tunnel-client/releases/download/v0.5.15/tunnel_0.5.15_windows_64-bit.zip",
             "hash": "b9ddc128565f2ccf077b5a5b8d20e7545be49c96fd6b6f986635de16367ef00c"
+        },
+        "32bit": {
+            "url": "https://github.com/labstack/tunnel-client/releases/download/v0.5.15/tunnel_0.5.15_windows_32-bit.zip",
+            "hash": "fa2c2a376b0caa6b82b6041a118b192b79cf265a976e5648cc05bf83cb2093b9"
         }
     },
     "bin": "tunnel.exe",
     "checkver": "github",
     "autoupdate": {
         "architecture": {
-            "32bit": {
-                "url": "https://github.com/labstack/tunnel-client/releases/download/v$version/tunnel_$version_windows_32-bit.zip"
-            },
             "64bit": {
                 "url": "https://github.com/labstack/tunnel-client/releases/download/v$version/tunnel_$version_windows_64-bit.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/labstack/tunnel-client/releases/download/v$version/tunnel_$version_windows_32-bit.zip"
             }
         },
         "hash": {

diff --git a/bucket/tup.json b/bucket/tup.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://gittup.org",
-    "description": "A file-based build system for Linux, OSX, and Windows.",
     "version": "0.7.10",
+    "description": "A file-based build system for Linux, OSX, and Windows.",
+    "homepage": "http://gittup.org",
     "license": {
         "identifier": "GPL-2.0-or-later|Proprietary",
         "url": "https://github.com/gittup/tup/blob/master/docs/html/license.html"
@@ -11,7 +11,7 @@
     "bin": "tup.exe",
     "checkver": {
         "url": "http://gittup.org/tup/win32",
-        "re": "tup-v([\\w.-]+).zip",
+        "regex": "tup-v([\\w.-]+)\\.zip",
         "reverse": true
     },
     "autoupdate": {

diff --git a/bucket/unar.json b/bucket/unar.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://theunarchiver.com/command-line",
+    "version": "1.8.1",
     "description": "Universal archives extractor.",
+    "homepage": "https://theunarchiver.com/command-line",
     "license": "LGPL-2.1-or-later",
-    "version": "1.8.1",
     "url": "https://cdn.theunarchiver.com/downloads/unarWindows.zip",
     "hash": "61A6B299606282F72F51C278801EAC11D3DCCFAC83E2D68BCCCE33539912E0DD",
     "bin": [

diff --git a/bucket/uncap.json b/bucket/uncap.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://github.com/susam/uncap",
+    "version": "0.3.0",
     "description": "Map Caps Lock to Escape, or any key to any key.",
+    "homepage": "https://github.com/susam/uncap",
     "license": "MIT",
-    "version": "0.3.0",
     "url": "https://github.com/susam/uncap/releases/download/0.3.0/uncap.exe",
     "hash": "4b815b0f6d7369bdb3e943ad2be13bdc002c6916ac7425f69c3f1681c3f31a47",
     "bin": "uncap.exe",

diff --git a/bucket/unrar.json b/bucket/unrar.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.rarlab.com/",
-    "description": "Decompress RAR files.",
     "version": "6.00",
+    "description": "Decompress RAR files.",
+    "homepage": "https://www.rarlab.com/",
     "license": {
         "identifier": "Freeware",
         "url": "https://www.rarlab.com/license.htm"

diff --git a/bucket/unzip.json b/bucket/unzip.json
@@ -1,11 +1,13 @@
 {
+    "version": "6.00",
+    "description": "Unzip compression utility",
     "homepage": "http://www.info-zip.org/",
     "license": {
         "identifier": "Freeware",
         "url": "http://infozip.sourceforge.net/doc/LICENSE"
     },
-    "description": "Unzip compression utility",
-    "version": "6.00",
+    "url": "https://raw.githubusercontent.com/ScoopInstaller/Binary/master/unzip/unz600xn.exe#/dl.7z",
+    "hash": "7869ee36346b47701ef01efd0bc2889f970266b66c80b30f74303d50bf7fa33d",
     "bin": [
         "SFXWiz32.exe",
         "unzipsfx.exe",
@@ -16,7 +18,5 @@
             "zipinfo",
             "-Z"
         ]
-    ],
-    "hash": "7869ee36346b47701ef01efd0bc2889f970266b66c80b30f74303d50bf7fa33d",
-    "url": "https://raw.githubusercontent.com/ScoopInstaller/Binary/master/unzip/unz600xn.exe#/dl.7z"
+    ]
 }
diff --git a/bucket/upm.json b/bucket/upm.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://github.com/replit/upm",
+    "version": "1.0",
     "description": "Universal package manager for Python, Node.js, Ruby and Emacs Lisp.",
+    "homepage": "https://github.com/replit/upm",
     "license": "MIT",
-    "version": "1.0",
     "architecture": {
         "64bit": {
             "url": "https://github.com/replit/upm/releases/download/v1.0/upm_1.0_windows_amd64.tar.gz",

diff --git a/bucket/upx.json b/bucket/upx.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://upx.github.io/",
-    "description": "UPX is a free, portable, extendable, high-performance executable packer for several executable formats",
     "version": "3.96",
+    "description": "UPX is a free, portable, extendable, high-performance executable packer for several executable formats",
+    "homepage": "https://upx.github.io/",
     "license": "GPL-2.0-or-later",
     "architecture": {
         "64bit": {