From bb7cadd17099ce577cb146ccab55ca2263c7f48a Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 2 Mar 2017 14:25:24 -0800 Subject: [PATCH 1/6] Migrate selected CLI apps from rasa/scoops (fixes #1358) --- cdrtools.json | 35 +++++++++++++++++++++++++++++++++++ handbrake_cli.json | 33 +++++++++++++++++++++++++++++++++ metastore.json | 13 +++++++++++++ netcat.json | 28 ++++++++++++++++++++++------ pciutils.json | 35 +++++++++++++++++++++++++++++++++++ poppler.json | 23 +++++++++++++++++++++++ smartmontools.json | 26 ++++++++++++++++++++++++++ sslscan.json | 9 +++++++++ tesseract.json | 24 ++++++++++++++++++++++++ tidy.json | 32 ++++++++++++++++++++++++++++++++ unrar.json | 19 +++++++++++++++++++ unzip.json | 28 ++++++++++++---------------- wkhtmltopdf.json | 42 ++++++++++++++++++++++++++++++++++++++++++ x264-10bit.json | 23 +++++++++++++++++++++++ x264.json | 27 +++++++++++++++++++++++++++ xmlstarlet.json | 17 +++++++++++++++++ zip.json | 36 ++++++++++++++++++++---------------- 17 files changed, 412 insertions(+), 38 deletions(-) create mode 100644 cdrtools.json create mode 100644 handbrake_cli.json create mode 100644 metastore.json create mode 100644 pciutils.json create mode 100644 poppler.json create mode 100644 smartmontools.json create mode 100644 sslscan.json create mode 100644 tesseract.json create mode 100644 tidy.json create mode 100644 unrar.json create mode 100644 wkhtmltopdf.json create mode 100644 x264-10bit.json create mode 100644 x264.json create mode 100644 xmlstarlet.json diff --git a/cdrtools.json b/cdrtools.json new file mode 100644 index 0000000000..7d538541e3 --- /dev/null +++ b/cdrtools.json @@ -0,0 +1,35 @@ +{ + "architecture": { + "32bit": { + "extract_dir": "win32" + }, + "64bit": { + "extract_dir": "win64" + } + }, + "autoupdate": { + "url": "https://sourceforge.net/projects/tumagcc/files/schily-cdrtools-$version.7z" + }, + "bin": [ + "btcflash.exe", + "cdda2wav.exe", + "cdrecord.exe", + "devdump.exe", + "isodebug.exe", + "isodump.exe", + "isoinfo.exe", + "isovfy.exe", + "mkhybrid.exe", + "mkisofs.exe", + "readcd.exe", + "rscsi.exe", + "scgcheck.exe", + "scgskeleton.exe" + ], + "description": "Burn and read CDs, DVDs, and Blu-ray discs", + "hash": "f534062cab7585b82bd764f02bc65fb0c7c27ac1615786bfc81c35880ce4acc6", + "homepage": "https://sourceforge.net/projects/tumagcc/", + "license": "CDDL-1.0/GPL-2.0/LGPL-2.1", + "url": "https://sourceforge.net/projects/tumagcc/files/schily-cdrtools-3.01.7z", + "version": "3.01" +} diff --git a/handbrake_cli.json b/handbrake_cli.json new file mode 100644 index 0000000000..1632a8845e --- /dev/null +++ b/handbrake_cli.json @@ -0,0 +1,33 @@ +{ + "architecture": { + "32bit": { + "hash": "44df91708721dd131a504bd4b23f6b4f0ab582e88f6d91f87a28b260c27b8d18", + "url": "https://handbrake.fr/rotation.php?file=HandBrakeCLI-1.0.3-win-i686.zip#/dl.zip" + }, + "64bit": { + "hash": "64cf72ce281a1abaf52924f5f531f4037311e6ed4dabc0ba8e7130f08f8c00fa", + "url": "https://handbrake.fr/rotation.php?file=HandBrakeCLI-1.0.3-win-x86_64.zip#/dl.zip" + } + }, + "autoupdate": { + "architecture": { + "32bit": { + "url": "https://handbrake.fr/rotation.php?file=HandBrakeCLI-$version-win-i686.zip#/dl.zip" + }, + "64bit": { + "url": "https://handbrake.fr/rotation.php?file=HandBrakeCLI-$version-win-x86_64.zip#/dl.zip" + } + } + }, + "bin": [ + "HandBrakeCLI.exe" + ], + "checkver": { + "re": "Current\\s+Version:\\s+([\\d.]+)", + "url": "https://handbrake.fr/downloads2.php" + }, + "description": "Convert videos with CLI program", + "homepage": "https://handbrake.fr/", + "license": "GPL-2.0", + "version": "1.0.3" +} diff --git a/metastore.json b/metastore.json new file mode 100644 index 0000000000..666cba7296 --- /dev/null +++ b/metastore.json @@ -0,0 +1,13 @@ +{ + "bin": "metastore.exe", + "checkver": { + "re": "/releases/tag/([a-f0-9]+)\"", + "url": "https://github.com/rasa/metastore/releases/latest" + }, + "description": "Store and restore metadata from a filesystem", + "hash": "93394fa2c43f60155f811cfa7c718d85aa4d0b61a9ce3267075ded716fdc7025", + "homepage": "https://github.com/rasa/metastore", + "license": "GPL-2.0", + "url": "https://github.com/rasa/metastore/releases/download/95d4e2d/metastore.exe", + "version": "95d4e2d" +} diff --git a/netcat.json b/netcat.json index d58c040139..80fa73f26a 100644 --- a/netcat.json +++ b/netcat.json @@ -1,8 +1,24 @@ { - "homepage": "http://www.rodneybeede.com/Compile_Netcat_on_Windows_using_MinGW.html", - "version": "1.11", - "url": "http://www.rodneybeede.com/downloads/nc111nt_rodneybeede.zip", - "hash": "cf46a1a2bd75260638598908075ebfa37ac0a5073e9555025895e506fe8a0807", - "extract_dir": "nc111nt_rodneybeede", - "bin": "nc.exe" + "architecture": { + "32bit": { + "bin": "nc.exe" + }, + "64bit": { + "bin": [ + [ + "nc64.exe", + "nc" + ] + ] + } + }, + "autoupdate": { + "url": "https://eternallybored.org/misc/netcat/netcat-win32-$version.zip" + }, + "description": "Read and write from/to network connections", + "hash": "413f85a1dbac60ab5516742d76beff4f4da22b8ef1a424f10f36ec77e6d274b1", + "homepage": "https://eternallybored.org/misc/netcat/", + "license": "GPL-2.0", + "url": "https://eternallybored.org/misc/netcat/netcat-win32-1.12.zip", + "version": "1.12" } diff --git a/pciutils.json b/pciutils.json new file mode 100644 index 0000000000..736a962810 --- /dev/null +++ b/pciutils.json @@ -0,0 +1,35 @@ +{ + "architecture": { + "32bit": { + "extract_dir": "pciutils-3.4.0-win32", + "hash": "baba72451033904ff19072b091392caee1da75a4338cb5aff10c19e65621e", + "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-3.4.0-win32.zip" + }, + "64bit": { + "extract_dir": "pciutils-3.4.0-win64", + "hash": "d5a5201110643160ebd3cbe97461a5a978040806bed75172344860dbe9f2fbcb", + "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-3.4.0-win64.zip" + } + }, + "autoupdate": { + "architecture": { + "32bit": { + "extract_dir": "pciutils-$version-win32", + "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-$version-win32.zip" + }, + "64bit": { + "extract_dir": "pciutils-$version-win64", + "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-$version-win64.zip" + } + } + }, + "bin": [ + "lspci.exe", + "setpci.exe" + ], + "checkver": "href=\"releases/pciutils-([\\d.]+)", + "description": "Inspect and manipulate configuration of PCI devices", + "homepage": "https://eternallybored.org/misc/pciutils/", + "license": "GPL-2.0", + "version": "3.4.0" +} diff --git a/poppler.json b/poppler.json new file mode 100644 index 0000000000..297c65146a --- /dev/null +++ b/poppler.json @@ -0,0 +1,23 @@ +{ + "bin": [ + "bin/pdfdetach.exe", + "bin/pdffonts.exe", + "bin/pdfimages.exe", + "bin/pdfinfo.exe", + "bin/pdfseparate.exe", + "bin/pdftocairo.exe", + "bin/pdftohtml.exe", + "bin/pdftoppm.exe", + "bin/pdftops.exe", + "bin/pdftotext.exe", + "bin/pdfunite.exe" + ], + "checkver": "Latest binary.*-(0\\.[56789][\\d.]+)_", + "description": "PDF rendering library", + "extract_dir": "poppler-0.51", + "hash": "8c027037355f11d16fde2fe34823006c142c7460bd64a37da7b6b23327a15f13", + "homepage": "http://blog.alivate.com.au/poppler-windows/", + "license": "GPL-3.0", + "url": "http://blog.alivate.com.au/wp-content/uploads/2017/01/poppler-0.51_x86.7z", + "version": "0.51" +} diff --git a/smartmontools.json b/smartmontools.json new file mode 100644 index 0000000000..b066a21742 --- /dev/null +++ b/smartmontools.json @@ -0,0 +1,26 @@ +{ + "bin": [ + "bin/runcmdu.exe", + "bin/smartctl.exe", + "bin/smartctl-nc.exe", + "bin/smartd.exe", + "bin/update-smart-drivedb.exe", + "bin/wtssendmsg.exe" + ], + "checkver": { + "re": ">Download\\s+smartmontools-([\\d.\\-]+)\\.", + "url": "https://sourceforge.net/projects/smartmontools/files/smartmontools/" + }, + "description": "Read SMART data from disks", + "hash": "564ff79214af60c4ab0d222ae61781624ca56278bc777963ebe0f19f87f04e3f", + "homepage": "https://www.smartmontools.org/", + "installer": { + "args": [ + "/S", + "/D=$dir" + ] + }, + "license": "GPL-2.0", + "url": "https://sourceforge.net/projects/smartmontools/files/smartmontools/6.5/smartmontools-6.5-1.win32-setup.exe", + "version": "6.5-1" +} diff --git a/sslscan.json b/sslscan.json new file mode 100644 index 0000000000..5720b561ee --- /dev/null +++ b/sslscan.json @@ -0,0 +1,9 @@ +{ + "bin": "sslscan.exe", + "description": "Discover supported cipher suites for SSL/TLS enabled services", + "hash": "cd0e4f86b2b494afa187fbef4753e876c3fb7f06cb528785bb89ab25cc26989c", + "homepage": "https://github.com/rbsec/sslscan", + "license": "GPL-3.0", + "url": "https://github.com/rbsec/sslscan/releases/download/1.11.0-rbsec/sslscan-win-1.11.0-rbsec.zip", + "version": "1.11.0" +} diff --git a/tesseract.json b/tesseract.json new file mode 100644 index 0000000000..ce163ebd43 --- /dev/null +++ b/tesseract.json @@ -0,0 +1,24 @@ +{ + "autoupdate": { + "url": "http://digi.bib.uni-mannheim.de/tesseract/tesseract-ocr-setup-$versiondev.exe" + }, + "checkver": { + "re": "The latest installer can be downloaded here:\nWinRAR\\s+x86\\s+\\(32\\s+bit\\)\\s+([\\d.]+)<", + "url": "http://www.rarlab.com/download.htm" + }, + "description": "Uncompress RAR files", + "hash": "27293c101577320fafefc691af98d762361c23e62817ca340ce04a7bba892173", + "homepage": "http://www.rarlab.com/", + "installer": { + "args": [ + "-s", + "-d$dir" + ] + }, + "license": "Freeware", + "url": "http://www.rarlab.com/rar/unrarw32.exe", + "version": "5.40" +} diff --git a/unzip.json b/unzip.json index 19a4b1fae9..76bed9691f 100644 --- a/unzip.json +++ b/unzip.json @@ -1,19 +1,15 @@ { - "homepage": "http://mingw.org/wiki/MSYS", - "version": "6.0", - "license": "GPL2", - "url": [ - "https://sourceforge.net/projects/mingw/files/MSYS/Extension/unzip/unzip-6.0-1/unzip-6.0-1-msys-1.0.13-bin.tar.lzma", - "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma" - ], - "hash": [ - "ecb6749234f83389b34723db52a36326421e9bb1aa41f0ce575aa802ca390c79", - "4e262a414f238773b311c8bb55a52e62743c06e0e55b319ca5b47e3e306464d5" - ], "bin": [ - "bin\\funzip.exe", - "bin\\unzip.exe", - "bin\\unzipsfx.exe", - "bin\\zipinfo.exe" - ] + "SFXWiz32.exe", + "unzipsfx.exe", + "unzip.exe", + "funzip.exe" + ], + "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" } diff --git a/wkhtmltopdf.json b/wkhtmltopdf.json new file mode 100644 index 0000000000..41a4e3e8e1 --- /dev/null +++ b/wkhtmltopdf.json @@ -0,0 +1,42 @@ +{ + "architecture": { + "32bit": { + "hash": "", + "installer": { + "args": [ + "/S", + "/D=$dir" + ] + }, + "url": "http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_msvc2015-win32.exe" + }, + "64bit": { + "hash": "14a5996adc77dc606944dbc0dc682bff104cd38cc1bec19253444cb87f259797", + "installer": { + "args": [ + "/S", + "/D=$dir" + ] + }, + "url": "http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_msvc2015-win64.exe" + } + }, + "bin": [ + "bin\\wkhtmltoimage.exe", + "bin\\wkhtmltopdf.exe" + ], + "checkver": { + "re": "The\\s+current\\s+stable\\s+series\\s+is\\s+([\\d.]+)", + "url": "http://wkhtmltopdf.org/downloads.html" + }, + "description": "Render HTML into PDF", + "homepage": "http://wkhtmltopdf.org/", + "license": "LGPL-3.0", + "uninstaller": { + "args": [ + "/S" + ], + "file": "Uninstall.exe" + }, + "version": "0.12.4" +} diff --git a/x264-10bit.json b/x264-10bit.json new file mode 100644 index 0000000000..99a23dedcd --- /dev/null +++ b/x264-10bit.json @@ -0,0 +1,23 @@ +{ + "architecture": { + "32bit": { + "hash": "c7fdf90a677b6934a26de868c97b53c49a5c26bd32532fff168264611c1bb687", + "url": "http://download.videolan.org/pub/x264/binaries/win32/x264-10b-r2762-90a61ec.exe" + }, + "64bit": { + "hash": "077c1ea1cf96591b20846067e787aecaba626dad6ca7252442c736d9877efdc8", + "url": "http://download.videolan.org/pub/x264/binaries/win64/x264-10b-r2762-90a61ec.exe" + } + }, + "bin": [ + [ + "x264-10b-r2762-90a61ec.exe", + "x264-10b" + ] + ], + "description": "H.264/MPEG-4 AVC video encoder (10 bit)", + "homepage": "https://www.videolan.org/developers/x264.html", + "license": "GPL-2.0", + "notes": "Version 0.148.2762 (90a61ec) was released on 2017-01-30", + "version": "17.01.30" +} diff --git a/x264.json b/x264.json new file mode 100644 index 0000000000..2193db3822 --- /dev/null +++ b/x264.json @@ -0,0 +1,27 @@ +{ + "architecture": { + "32bit": { + "hash": "c7fdf90a677b6934a26de868c97b53c49a5c26bd32532fff168264611c1bb687", + "url": "http://download.videolan.org/pub/x264/binaries/win32/x264-r2762-90a61ec.exe" + }, + "64bit": { + "hash": "e493de4c1524472cffb921197e12cb908171fb0d67809a20e0e9876e0f9233c5", + "url": "http://download.videolan.org/pub/x264/binaries/win64/x264-r2762-90a61ec.exe" + } + }, + "bin": [ + [ + "x264-r2762-90a61ec.exe", + "x264-8b" + ], + [ + "x264-r2762-90a61ec.exe", + "x264" + ] + ], + "description": "H.264/MPEG-4 AVC video encoder (8 bit)", + "homepage": "https://www.videolan.org/developers/x264.html", + "license": "GPL-2.0", + "notes": "Version 0.148.2762 (90a61ec) was released on 2017-01-30", + "version": "17.01.30" +} diff --git a/xmlstarlet.json b/xmlstarlet.json new file mode 100644 index 0000000000..a66f072394 --- /dev/null +++ b/xmlstarlet.json @@ -0,0 +1,17 @@ +{ + "autoupdate": { + "bin": "xmlstarlet-$version/xml.exe", + "url": "https://sourceforge.net/projects/xmlstar/files/xmlstarlet/$version/xmlstarlet-$version-win32.zip" + }, + "bin": "xmlstarlet-1.6.1/xml.exe", + "checkver": { + "re": "/files/latest/download\\?source=files\"\\s+title=\"/xmlstarlet/([\\d.]+)", + "url": "https://sourceforge.net/projects/xmlstar/files/" + }, + "description": "Transform, query, validate, and edit XML files", + "hash": "4ee3d767d9126308d6bcf7b7290e85614a83fe51a9d84e765b9b7f4359f79fce", + "homepage": "http://xmlstar.sourceforge.net/", + "license": "MIT", + "url": "https://sourceforge.net/projects/xmlstar/files/xmlstarlet/1.6.1/xmlstarlet-1.6.1-win32.zip", + "version": "1.6.1" +} diff --git a/zip.json b/zip.json index 7920a2f854..b88463c273 100644 --- a/zip.json +++ b/zip.json @@ -1,19 +1,23 @@ { - "homepage": "http://mingw.org/wiki/MSYS", - "version": "3.0", - "license": "http://www.info-zip.org/doc/LICENSE", - "url": [ - "https://sourceforge.net/projects/mingw/files/MSYS/Extension/zip/zip-3.0-1/zip-3.0-1-msys-1.0.14-bin.tar.lzma", - "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma" - ], - "hash": [ - "ffe9b49d5302e00f8e5e6c6166e2f6e898c9459e696812284c8f37350f6fc45d", - "4e262a414f238773b311c8bb55a52e62743c06e0e55b319ca5b47e3e306464d5" - ], + "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" + } + }, "bin": [ - "bin/zip.exe", - "bin/zipcloak.exe", - "bin/zipnote.exe", - "bin/zipsplit.exe" - ] + "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" } From 3d252a4b3ca6274e178d23b66e09969e569c41bc Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 2 Mar 2017 14:48:54 -0800 Subject: [PATCH 2/6] Fix xmlstarlet --- xmlstarlet.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xmlstarlet.json b/xmlstarlet.json index a66f072394..e128c6f135 100644 --- a/xmlstarlet.json +++ b/xmlstarlet.json @@ -1,14 +1,15 @@ { "autoupdate": { - "bin": "xmlstarlet-$version/xml.exe", + "extract_dir": "xmlstarlet-$version", "url": "https://sourceforge.net/projects/xmlstar/files/xmlstarlet/$version/xmlstarlet-$version-win32.zip" }, - "bin": "xmlstarlet-1.6.1/xml.exe", + "bin": "xml.exe", "checkver": { "re": "/files/latest/download\\?source=files\"\\s+title=\"/xmlstarlet/([\\d.]+)", "url": "https://sourceforge.net/projects/xmlstar/files/" }, "description": "Transform, query, validate, and edit XML files", + "extract_dir": "xmlstarlet-1.6.1", "hash": "4ee3d767d9126308d6bcf7b7290e85614a83fe51a9d84e765b9b7f4359f79fce", "homepage": "http://xmlstar.sourceforge.net/", "license": "MIT", From e9273b73dc1f8879c9d2e2115cb3aae92975d441 Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 2 Mar 2017 14:50:55 -0800 Subject: [PATCH 3/6] Add autoupdate to poppler --- poppler.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/poppler.json b/poppler.json index 297c65146a..116550b972 100644 --- a/poppler.json +++ b/poppler.json @@ -1,4 +1,7 @@ { + "autoupdate": { + "url": "http://blog.alivate.com.au/wp-content/uploads/2017/03/poppler-$version_x86.7z" + }, "bin": [ "bin/pdfdetach.exe", "bin/pdffonts.exe", From 7824350fbe4c6ad48d67eba3f5a7c8574bb98022 Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 2 Mar 2017 16:21:20 -0800 Subject: [PATCH 4/6] Fix autoupdate url in poppler --- poppler.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poppler.json b/poppler.json index 116550b972..34c3ef70a2 100644 --- a/poppler.json +++ b/poppler.json @@ -1,6 +1,6 @@ { "autoupdate": { - "url": "http://blog.alivate.com.au/wp-content/uploads/2017/03/poppler-$version_x86.7z" + "url": "http://blog.alivate.com.au/wp-content/uploads/$matchDate/poppler-$version_x86.7z" }, "bin": [ "bin/pdfdetach.exe", @@ -15,7 +15,7 @@ "bin/pdftotext.exe", "bin/pdfunite.exe" ], - "checkver": "Latest binary.*-(0\\.[56789][\\d.]+)_", + "checkver": "Latest.*uploads/(?\\d{4}/\\d{2})/poppler-(?[\\d.]+)_x86.7z", "description": "PDF rendering library", "extract_dir": "poppler-0.51", "hash": "8c027037355f11d16fde2fe34823006c142c7460bd64a37da7b6b23327a15f13", From bf4db18cc00984585945c233a97d2530c928ff61 Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 2 Mar 2017 20:11:00 -0800 Subject: [PATCH 5/6] Add (back) zipinfo command to zip --- unzip.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/unzip.json b/unzip.json index 76bed9691f..82d0009ca5 100644 --- a/unzip.json +++ b/unzip.json @@ -3,7 +3,8 @@ "SFXWiz32.exe", "unzipsfx.exe", "unzip.exe", - "funzip.exe" + "funzip.exe", + [ "unzip.exe", "zipinfo", "-Z" ] ], "description": "Unzip compression utility", "hash": "7869ee36346b47701ef01efd0bc2889f970266b66c80b30f74303d50bf7fa33d", From 19cba6c625623e1729d76e039d88fd86dc56cae1 Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Fri, 3 Mar 2017 16:12:26 -0800 Subject: [PATCH 6/6] Update tidy to 5.4.0 --- tidy.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tidy.json b/tidy.json index 79ffeebec9..fbc55ed102 100644 --- a/tidy.json +++ b/tidy.json @@ -1,23 +1,21 @@ { "architecture": { "32bit": { - "extract_dir": "tidy-5.2.0-win32/bin", - "hash": "94d653498b4f93b14f12a55ca06154e19c540c9b276e5d163f1cf84fa078f97a", - "url": "http://binaries.html-tidy.org/binaries/tidy-5.2.0/tidy-5.2.0-win32.zip" + "hash": "3a4d634113ebf41c13a397cd201b5b84ccf41f9d34829eb57114fd098f1a47a4", + "url": "https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-win32.zip" }, "64bit": { - "extract_dir": "tidy-5.2.0-win64/bin", - "hash": "dd9fd814cc44bc2ffa9b9e547b1a6cbb42b6be7b9358542d3ee7f6e10b676423", - "url": "http://binaries.html-tidy.org/binaries/tidy-5.2.0/tidy-5.2.0-win64.zip" + "hash": "b01d8382ef6da124298e797a4dcc0ca24060aa29fb5fd1b384b598600a1d78fe", + "url": "https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-win64.zip" } }, "autoupdate": { "architecture": { "32bit": { - "url": "http://binaries.html-tidy.org/binaries/tidy-$version/tidy-$version-win32.zip" + "url": "https://github.com/htacg/tidy-html5/releases/download/$version/tidy-$version-win32.zip" }, "64bit": { - "url": "http://binaries.html-tidy.org/binaries/tidy-$version/tidy-$version-win64.zip" + "url": "https://github.com/htacg/tidy-html5/releases/download/$version/tidy-$version-win64.zip" } } }, @@ -26,7 +24,8 @@ "github": "https://github.com/htacg/tidy-html5" }, "description": "Tidy HTML and XML files", + "extract_dir": "bin", "homepage": "http://www.html-tidy.org/", "license": "http://www.html-tidy.org/documentation/#license", - "version": "5.2.0" + "version": "5.4.0" }