From 07a7da12333726a266b102584b97729ec487cd78 Mon Sep 17 00:00:00 2001 From: Brandon Smith Date: Tue, 29 Jan 2019 16:46:54 -0500 Subject: [PATCH] Format manifests --- clink.json | 4 +--- colortool.json | 4 +--- docker-nightly.json | 24 ++++++------------------ dosbox.json | 4 +--- dotnet.json | 4 +--- draft.json | 4 +--- empty-recycle-bin.json | 12 ++++++------ forge.json | 4 +--- git19.json | 4 +--- gow.json | 4 +--- groovyserv.json | 4 +--- inadyn-mt.json | 4 +--- innoextract.json | 4 +--- iperf3.json | 4 +--- kompose.json | 4 +--- kotlin-native.json | 4 +--- lua-for-windows.json | 4 +--- lzip.json | 4 +--- maven.json | 4 +--- msmpi.json | 4 +--- nano.json | 4 +--- ninja.json | 4 +--- nunit-console.json | 4 +--- nvm.json | 8 ++------ openshift-origin-client.json | 4 +--- pngcrush.json | 4 +--- postgresql.json | 4 +--- premake4.json | 4 +--- premake5.json | 4 +--- psutils.json | 6 +++++- python-exp.json | 4 +--- rancher-compose.json | 4 +--- svtplay-dl.json | 2 +- which.json | 8 ++------ winpython.json | 1 - xming.json | 4 +--- yasm.json | 4 +--- yubico-piv-tool.json | 4 +--- zookeeper.json | 4 +--- 39 files changed, 54 insertions(+), 135 deletions(-) diff --git a/clink.json b/clink.json index bda8ab3236..f69371595c 100644 --- a/clink.json +++ b/clink.json @@ -8,9 +8,7 @@ "checkver": { "github": "https://github.com/mridgers/clink/" }, - "bin": [ - "clink.bat" - ], + "bin": "clink.bat", "notes": [ "Run 'clink inject' to start clink on the current cmd", "Run 'clink autorun' to auto start clink" diff --git a/colortool.json b/colortool.json index 8c1c6073c6..90cdf49456 100644 --- a/colortool.json +++ b/colortool.json @@ -6,9 +6,7 @@ "url": "https://github.com/Microsoft/console/releases/download/1810.02002/colortool.zip", "hash": "fa3373d02b0835502bf0fa643ef3d7cf247b082357a33c6bceee07416371b672", "bin": "colortool.exe", - "persist": [ - "schemes" - ], + "persist": "schemes", "checkver": { "github": "https://github.com/Microsoft/console" }, diff --git a/docker-nightly.json b/docker-nightly.json index d0986b8a50..a112721e58 100644 --- a/docker-nightly.json +++ b/docker-nightly.json @@ -10,24 +10,12 @@ "lcow" ], "suggest": { - "Linux container support on Windows": [ - "lcow" - ], - "Docker Compose": [ - "docker-compose" - ], - "Docker Machine": [ - "docker-machine" - ], - "Kubernetes Standalone": [ - "minikube" - ], - "Kubernetes Client": [ - "kubectl" - ], - "compose.yml to kubernetes.yml": [ - "kompose" - ] + "Linux container support on Windows": "lcow", + "Docker Compose": "docker-compose", + "Docker Machine": "docker-machine", + "Kubernetes Standalone": "minikube", + "Kubernetes Client": "kubectl", + "compose.yml to kubernetes.yml": "kompose" }, "bin": [ "dockerd.exe", diff --git a/dosbox.json b/dosbox.json index 23fc048c45..53944ac204 100644 --- a/dosbox.json +++ b/dosbox.json @@ -13,9 +13,7 @@ }, "uninstaller": { "file": "uninstall.exe", - "args": [ - "/S" - ] + "args": "/S" }, "bin": [ "DOSBox.exe", diff --git a/dotnet.json b/dotnet.json index 01bf1d4ddc..a0b1d67863 100644 --- a/dotnet.json +++ b/dotnet.json @@ -13,7 +13,5 @@ } }, "bin": "dotnet.exe", - "notes": [ - "This app is deprecated. Install `dotnet-sdk` instead." - ] + "notes": "This app is deprecated. Install `dotnet-sdk` instead." } diff --git a/draft.json b/draft.json index 093971c949..c4b0e5628d 100644 --- a/draft.json +++ b/draft.json @@ -9,9 +9,7 @@ } }, "extract_dir": "windows-amd64", - "bin": [ - "draft.exe" - ], + "bin": "draft.exe", "checkver": { "github": "https://github.com/Azure/draft" }, diff --git a/empty-recycle-bin.json b/empty-recycle-bin.json index 5f0b0af2b2..5f97fa0a46 100644 --- a/empty-recycle-bin.json +++ b/empty-recycle-bin.json @@ -1,11 +1,11 @@ { - "version": "1.0.0", + "version": "1.0.0", "description": "Empty the Windows recycle bin", - "homepage": "https://github.com/sindresorhus/empty-recycle-bin", - "license": "MIT", - "url": "https://github.com/sindresorhus/empty-recycle-bin/releases/download/1.0.0/empty-recycle-bin.exe", - "hash": "B5C939A5747AFA4D43F2342705726602E34D9CF46FE6664C2A7D0DEA39E64560", - "bin": "empty-recycle-bin.exe", + "homepage": "https://github.com/sindresorhus/empty-recycle-bin", + "license": "MIT", + "url": "https://github.com/sindresorhus/empty-recycle-bin/releases/download/1.0.0/empty-recycle-bin.exe", + "hash": "B5C939A5747AFA4D43F2342705726602E34D9CF46FE6664C2A7D0DEA39E64560", + "bin": "empty-recycle-bin.exe", "checkver": "github", "autoupdate": { "url": "https://github.com/sindresorhus/empty-recycle-bin/releases/download/$version/empty-recycle-bin.exe" diff --git a/forge.json b/forge.json index 132352e5dc..bd7529ff64 100644 --- a/forge.json +++ b/forge.json @@ -3,9 +3,7 @@ "version": "2.2.0", "url": "https://github.com/fsharp-editing/Forge/releases/download/2.2.0/forge.zip", "hash": "3033df677a766a0cb417fb987dcfbd8a54b06ae87ab58de2b849ede8bdc016f3", - "bin": [ - "forge.exe" - ], + "bin": "forge.exe", "checkver": { "github": "https://github.com/fsharp-editing/Forge" }, diff --git a/git19.json b/git19.json index df3394d52c..649a0c3cc6 100644 --- a/git19.json +++ b/git19.json @@ -8,7 +8,5 @@ "cmd\\git.exe", "cmd\\gitk.cmd" ], - "post_install": [ - "git config --global credential.helper wincred" - ] + "post_install": "git config --global credential.helper wincred" } diff --git a/gow.json b/gow.json index 651c0d6431..277d51642e 100644 --- a/gow.json +++ b/gow.json @@ -7,9 +7,7 @@ "url": "https://github.com/bmatzelle/gow/releases", "re": "Gow ([\\d.]+)" }, - "pre_install": [ - "\"@cscript //NoLogo \"\"$dir\\bin\\gow.vbs\"\" %1\" | Set-Content -force \"$dir\\bin\\gow.bat\"" - ], + "pre_install": "\"@cscript //NoLogo \"\"$dir\\bin\\gow.vbs\"\" %1\" | Set-Content -force \"$dir\\bin\\gow.bat\"", "post_install": [ "# create etc directory (required by bash), if needed", "if (! (test-path \"$dir\\etc\")) { new-item -itemtype directory \"$dir\\etc\" }" diff --git a/groovyserv.json b/groovyserv.json index ba9e937062..ebbe264cae 100644 --- a/groovyserv.json +++ b/groovyserv.json @@ -14,9 +14,7 @@ "bin\\groovyserver.exe" ], "suggest": { - "Groovy": [ - "groovy" - ] + "Groovy": "groovy" }, "checkver": { "github": "https://github.com/kobo/groovyserv" diff --git a/inadyn-mt.json b/inadyn-mt.json index dbb4fada4c..fb7be7ab64 100644 --- a/inadyn-mt.json +++ b/inadyn-mt.json @@ -9,9 +9,7 @@ }, "bin": "bin/win32/inadyn-mt.exe", "checkver": "title=\"/inadyn-mt/inadyn-mt\\.v\\.([\\d.]+)", - "depends": [ - "sudo" - ], + "depends": "sudo", "extract_dir": "inadyn-mt.v.02.28.10", "hash": "f69bea12d96b66f9f662a8df0730c60457b24f5fb5308b109936880ebf7be5ca", "notes": [ diff --git a/innoextract.json b/innoextract.json index 3ec0c05961..9e3c6badce 100644 --- a/innoextract.json +++ b/innoextract.json @@ -5,9 +5,7 @@ "license": "zlib", "url": "http://constexpr.org/innoextract/files/innoextract-1.7/innoextract-1.7-windows.zip", "hash": "md5:b801b0740b4ab19d69a739ab4a9180ae", - "bin": [ - "innoextract.exe" - ], + "bin": "innoextract.exe", "checkver": "(\\d+\\.\\d+)", "autoupdate": { "url": "http://constexpr.org/innoextract/files/innoextract-$version/innoextract-$version-windows.zip" diff --git a/iperf3.json b/iperf3.json index c0a5f66601..76c021d809 100644 --- a/iperf3.json +++ b/iperf3.json @@ -15,9 +15,7 @@ "extract_dir": "iperf-3.1.3-win32" } }, - "bin": [ - "iperf3.exe" - ], + "bin": "iperf3.exe", "checkver": { "url": "https://iperf.fr/iperf-download.php", "re": "iPerf ([\\d.]+)<\\/a>" diff --git a/kompose.json b/kompose.json index 64a4886a57..6ec72a96af 100644 --- a/kompose.json +++ b/kompose.json @@ -9,9 +9,7 @@ "hash": "7da79c4b559b84f02466a403c8294c87716c421c8321db935f6c452e5ceac8df" } }, - "bin": [ - "kompose.exe" - ], + "bin": "kompose.exe", "checkver": { "github": "https://github.com/kubernetes/kompose" }, diff --git a/kotlin-native.json b/kotlin-native.json index 55554e0a97..de15599fdf 100644 --- a/kotlin-native.json +++ b/kotlin-native.json @@ -16,9 +16,7 @@ ], "env_add_path": "bin", "suggest": { - "Kotlin": [ - "kotlin" - ] + "Kotlin": "kotlin" }, "checkver": { "github": "https://github.com/JetBrains/kotlin" diff --git a/lua-for-windows.json b/lua-for-windows.json index 705369137c..4a416896a3 100644 --- a/lua-for-windows.json +++ b/lua-for-windows.json @@ -13,9 +13,7 @@ "env_set": { "LUA_DEV": "$dir" }, - "depends": [ - "innounp" - ], + "depends": "innounp", "checkver": { "url": "https://github.com/rjpcomputing/luaforwindows/releases/latest", "re": "/releases/tag/v([\\d.\\-]+)" diff --git a/lzip.json b/lzip.json index e000996d89..37cde26c20 100644 --- a/lzip.json +++ b/lzip.json @@ -5,9 +5,7 @@ "url": "https://download.savannah.gnu.org/releases/lzip/lzip-1.20-w32.zip", "hash": "7ef27ab008377f6d96793b450391efee0a8682ca056a9fe688b264be92637271", "extract_dir": "lzip-1.20-w32", - "bin": [ - "bin\\lzip.exe" - ], + "bin": "bin\\lzip.exe", "checkver": { "url": "https://download.savannah.gnu.org/releases/lzip/", "re": "lzip-([\\d.]+)-w32.zip", diff --git a/maven.json b/maven.json index a958077589..2db8f414ba 100644 --- a/maven.json +++ b/maven.json @@ -23,7 +23,5 @@ "url": "$url.sha1" } }, - "persist": [ - "conf" - ] + "persist": "conf" } diff --git a/msmpi.json b/msmpi.json index 9625ca04d2..5df6c268c6 100644 --- a/msmpi.json +++ b/msmpi.json @@ -5,9 +5,7 @@ "url": "https://download.microsoft.com/download/4/A/6/4A6AAED8-200C-457C-AB86-37505DE4C90D/msmpisetup.exe", "hash": "2fa35146e3d7dce6aba3d9cd81c1e16166a405bfe7094d1ae03c60fcdeb8e455", "env_add_path": ".", - "pre_install": [ - "7z x -t# \"$dir\\msmpisetup.exe\" -o\"$dir\\tmp\"" - ], + "pre_install": "7z x -t# \"$dir\\msmpisetup.exe\" -o\"$dir\\tmp\"", "architecture": { "64bit": { "installer": { diff --git a/nano.json b/nano.json index 262ada2b1f..c8079cbc6b 100644 --- a/nano.json +++ b/nano.json @@ -6,9 +6,7 @@ "hash": "c012456b9f29e488b0e9a688aa43a34326dd573f9e99765cbdac2b81a4bc1060", "bin": "nano.exe", "extract_dir": "nano-2.5.3-win32", - "post_install": [ - "if (-not (Test-Path ~/nano.rc)) { Copy-Item \"$dir/nano.rc\" ~/nano.rc }" - ], + "post_install": "if (-not (Test-Path ~/nano.rc)) { Copy-Item \"$dir/nano.rc\" ~/nano.rc }", "checkver": "Latest Version\\s+([\\d.]+)", "notes": [ "You can configure nano editor by editing the configuration file nano.rc", diff --git a/ninja.json b/ninja.json index 48800cd98b..d9900d8d7d 100644 --- a/ninja.json +++ b/ninja.json @@ -4,9 +4,7 @@ "version": "1.8.2", "url": "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip", "hash": "c80313e6c26c0b9e0c241504718e2d8bbc2798b73429933adf03fdc6d84f0e70", - "bin": [ - "ninja.exe" - ], + "bin": "ninja.exe", "checkver": { "github": "https://github.com/ninja-build/ninja" }, diff --git a/nunit-console.json b/nunit-console.json index 5bd2deb7c8..58e66f4620 100644 --- a/nunit-console.json +++ b/nunit-console.json @@ -7,9 +7,7 @@ "hash": "EE11B97BD075414EC196ED6EAE8E526AA78BB59251D9BDABE513D07E3B2B7BEA", "bin": "nunit3-console.exe", "suggest": { - "NuGet": [ - "nuget" - ] + "NuGet": "nuget" }, "checkver": { "github": "https://github.com/nunit/nunit-console/", diff --git a/nvm.json b/nvm.json index a94027a9e6..51ce60ffde 100644 --- a/nvm.json +++ b/nvm.json @@ -2,9 +2,7 @@ "homepage": "https://github.com/coreybutler/nvm-windows", "version": "1.1.7", "url": "https://github.com/coreybutler/nvm-windows/releases/download/1.1.7/nvm-noinstall.zip", - "bin": [ - "nvm.exe" - ], + "bin": "nvm.exe", "persist": [ "nodejs", [ @@ -39,9 +37,7 @@ ] } }, - "notes": [ - "You'll need to restart powershell/cmd to have it reload Environment Variables so nvm will work correctly" - ], + "notes": "You'll need to restart powershell/cmd to have it reload Environment Variables so nvm will work correctly", "checkver": "github", "autoupdate": { "url": "https://github.com/coreybutler/nvm-windows/releases/download/$version/nvm-noinstall.zip", diff --git a/openshift-origin-client.json b/openshift-origin-client.json index 7457e4bf20..0bc21006ca 100644 --- a/openshift-origin-client.json +++ b/openshift-origin-client.json @@ -9,9 +9,7 @@ "hash": "cdb84cc0000d0f0983120f903b2cad7114527ce2a9c4eb1988986eda7b877bfa" } }, - "bin": [ - "oc.exe" - ], + "bin": "oc.exe", "checkver": { "url": "https://github.com/openshift/origin/releases/latest", "re": "openshift-origin-client-tools-v(?[\\d.]+)-(?[\\d\\w]+)-windows\\.zip" diff --git a/pngcrush.json b/pngcrush.json index 4a332656f2..4a51aa4a82 100644 --- a/pngcrush.json +++ b/pngcrush.json @@ -12,9 +12,7 @@ "hash": "sha1:ce02f50fa3d82f0d5464f28ac78d3ecee10c5f58" } }, - "bin": [ - "pngcrush.exe" - ], + "bin": "pngcrush.exe", "checkver": { "url": "https://sourceforge.net/projects/pmt/files/pngcrush-executables/", "re": "title=\"([0-9\\.]+)\"" diff --git a/postgresql.json b/postgresql.json index cb32e723b4..aac8569f7d 100644 --- a/postgresql.json +++ b/postgresql.json @@ -20,9 +20,7 @@ "env_set": { "PGDATA": "$dir\\data" }, - "post_install": [ - "if (!(Test-Path \"$dir\\data\\pg_hba.conf\")) { iex \"initdb --username=postgres --encoding=UTF8 --locale=en --lc-collate=C\" }" - ], + "post_install": "if (!(Test-Path \"$dir\\data\\pg_hba.conf\")) { iex \"initdb --username=postgres --encoding=UTF8 --locale=en --lc-collate=C\" }", "notes": "To start/stop service, run `pg_ctl start`, `pg_ctl stop`.", "checkver": { "url": "https://www.enterprisedb.com/products-services-training/pgbindownload", diff --git a/premake4.json b/premake4.json index 70e707ac4e..2aa0e92019 100644 --- a/premake4.json +++ b/premake4.json @@ -4,7 +4,5 @@ "license": "BSD-3-Clause", "url": "https://downloads.sourceforge.net/project/premake/Premake/4.4/premake-4.4-beta5-windows.zip", "hash": "09614c122156617a2b7973cc9f686daa32e64e3e7335d38db887cfb8f6a8574d", - "bin": [ - "premake4.exe" - ] + "bin": "premake4.exe" } diff --git a/premake5.json b/premake5.json index b8cba99f6e..6f972fe72c 100644 --- a/premake5.json +++ b/premake5.json @@ -4,9 +4,7 @@ "license": "BSD-3-Clause", "url": "https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-windows.zip", "hash": "712ee206fd2df4adf6320500b755d131ff5fac188a2a653876ae10d3066f4163", - "bin": [ - "premake5.exe" - ], + "bin": "premake5.exe", "checkver": { "url": "https://github.com/premake/premake-core/releases/latest", "re": "/releases/tag/v(5[0-9.]+-?(alpha|beta)?([0-9.]+)?)" diff --git a/psutils.json b/psutils.json index ecb1233dc9..d531e9285a 100644 --- a/psutils.json +++ b/psutils.json @@ -1,6 +1,10 @@ { "homepage": "https://github.com/lukesampson/psutils", - "description": "\n\tA collection of command line utilities written in PowerShell,\n\tproudly ignoring PowerShell Verb-Noun naming conventions.", + "description": [ + "", + "A collection of command line utilities written in PowerShell,", + "proudly ignoring PowerShell Verb-Noun naming conventions." + ], "version": "0.2018.08.04", "url": "https://github.com/lukesampson/psutils/archive/de1a069215c54a1cb105f3dc79f14e25570c75f2.zip", "hash": "432d21448ec3ed8e95e82e6ad0b633e096b1cd1c37bed081b8dbe2fd59f9fb1b", diff --git a/python-exp.json b/python-exp.json index 995b7ed014..7848ef25fc 100644 --- a/python-exp.json +++ b/python-exp.json @@ -114,8 +114,6 @@ "$create_reg.Invoke(\"Python\\PythonCore\\3.5\\InstallPath\", \"$dir\")", "$create_reg.Invoke(\"Python\\PythonCore\\3.5\\PythonPath\", \"$dir;$dir\\Lib\\;$dir\\DLLs\\\")" ], - "env_add_path": [ - "scripts" - ], + "env_add_path": "scripts", "checkver": "

Latest: Python ([\\d.]+) - .*

" } diff --git a/rancher-compose.json b/rancher-compose.json index a36c85d84a..de3b09ed2c 100644 --- a/rancher-compose.json +++ b/rancher-compose.json @@ -13,9 +13,7 @@ }, "license": "Apache-2.0", "extract_dir": "rancher-compose-v0.12.5", - "bin": [ - "rancher-compose.exe" - ], + "bin": "rancher-compose.exe", "checkver": { "github": "https://github.com/rancher/rancher-compose" }, diff --git a/svtplay-dl.json b/svtplay-dl.json index 7e13e8d2d1..538ae132e8 100644 --- a/svtplay-dl.json +++ b/svtplay-dl.json @@ -12,6 +12,6 @@ "url": "https://svtplay-dl.se/download/$version/svtplay-dl.zip" }, "suggest": { - "ffmpeg for joining audio and video streams": ["ffmpeg"] + "ffmpeg for joining audio and video streams": "ffmpeg" } } diff --git a/which.json b/which.json index c8c24c4e5c..6ec43590aa 100644 --- a/which.json +++ b/which.json @@ -2,11 +2,7 @@ "homepage": "http://gnuwin32.sourceforge.net/packages/which.htm", "version": "2.20", "license": "GPL-2.0", - "url": [ - "https://sourceforge.net/projects/gnuwin32/files/which/2.20/which-2.20-bin.zip" - ], - "hash": [ - "035ec15541649f75459fb81f02406c72e1129fc9041b308160938ae712a603a4" - ], + "url": "https://sourceforge.net/projects/gnuwin32/files/which/2.20/which-2.20-bin.zip", + "hash": "035ec15541649f75459fb81f02406c72e1129fc9041b308160938ae712a603a4", "bin": "bin\\which.exe" } diff --git a/winpython.json b/winpython.json index e9fae25746..96b09797f8 100644 --- a/winpython.json +++ b/winpython.json @@ -39,7 +39,6 @@ "architecture": { "64bit": { "url": "https://downloads.sourceforge.net/project/winpython/WinPython_$majorVersion.$minorVersion/$version/WinPython64-$versionZero.exe" - }, "32bit": { "url": "https://downloads.sourceforge.net/project/winpython/WinPython_$majorVersion.$minorVersion/$version/WinPython32-$versionZero.exe" diff --git a/xming.json b/xming.json index cb6acf0419..eeadb94b73 100644 --- a/xming.json +++ b/xming.json @@ -5,7 +5,5 @@ "url": "https://downloads.sourceforge.net/project/xming/Xming-mesa/6.9.0.31/Xming-mesa-6-9-0-31-setup.exe?r=scoop", "hash": "md5:E580DEBBF6110CFC4D8FCD20BEB541C1", "innosetup": true, - "bin": [ - "XLaunch.exe" - ] + "bin": "XLaunch.exe" } diff --git a/yasm.json b/yasm.json index 1ee52447dc..79b310588f 100644 --- a/yasm.json +++ b/yasm.json @@ -13,9 +13,7 @@ "url": "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe#/yasm.exe" } }, - "bin": [ - "yasm.exe" - ], + "bin": "yasm.exe", "checkver": { "url": "http://yasm.tortall.net/Download.html", "re": "Latest Release: ([\\d.]+)" diff --git a/yubico-piv-tool.json b/yubico-piv-tool.json index 7134bedbf6..c0f8f8df98 100644 --- a/yubico-piv-tool.json +++ b/yubico-piv-tool.json @@ -12,9 +12,7 @@ "hash": "97deb99fe1bc9320024cd6185a75bd5088e3fb03361494d31a73abbd7e42af5d" } }, - "bin": [ - "bin\\yubico-piv-tool.exe" - ], + "bin": "bin\\yubico-piv-tool.exe", "checkver": { "url": "https://developers.yubico.com/yubico-piv-tool/Releases/", "re": "yubico-piv-tool-([\\d.]+)-win64.zip" diff --git a/zookeeper.json b/zookeeper.json index 9635e1f944..67bfc46c69 100644 --- a/zookeeper.json +++ b/zookeeper.json @@ -10,9 +10,7 @@ "bin\\zkServer.cmd", "bin\\zkCli.cmd" ], - "persist": [ - "data" - ], + "persist": "data", "suggest": { "JDK": [ "java/oraclejdk",