From 8c2b9ac8b01c21cf86616216e94374d81c5d199d Mon Sep 17 00:00:00 2001 From: Richard Kuhnt Date: Mon, 29 Apr 2019 12:48:50 +0200 Subject: [PATCH] Fix SourceForge URLs Regression introduced with https://github.com/lukesampson/scoop/pull/3340 close #3380 --- bucket/coreutils.json | 12 ++++++------ bucket/file.json | 4 ++-- bucket/findutils.json | 10 +++++----- bucket/grep.json | 4 ++-- bucket/gzip.json | 4 ++-- bucket/iconv.json | 14 +++++++------- bucket/patch.json | 4 ++-- bucket/sed.json | 4 ++-- bucket/tar.json | 10 +++++----- bucket/telnet.json | 12 ++++++------ bucket/which.json | 4 ++-- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bucket/coreutils.json b/bucket/coreutils.json index e82b9c32f4..dfbadb2827 100644 --- a/bucket/coreutils.json +++ b/bucket/coreutils.json @@ -4,12 +4,12 @@ "homepage": "http://www.mingw.org/wiki/msys", "license": "GPL-2.0-only", "url": [ - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/termcap/termcap-0.20050421_1-2/libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys.RELEASE_NOTES.txt" + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/termcap/termcap-0.20050421_1-2/libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys.RELEASE_NOTES.txt" ], "hash": [ "sha1:fff020614bd796697739887c636f15a42b4b14aa", diff --git a/bucket/file.json b/bucket/file.json index 6f83e1fdb4..e04cf815fe 100644 --- a/bucket/file.json +++ b/bucket/file.json @@ -4,8 +4,8 @@ "homepage": "http://gnuwin32.sourceforge.net/packages/file.htm", "license": "GPL-2.0-only", "url": [ - "https://downloads.sourceforge.net/projects/gnuwin32/file/5.03/file-5.03-bin.zip", - "https://downloads.sourceforge.net/projects/gnuwin32/file/5.03/file-5.03-dep.zip" + "https://downloads.sourceforge.net/project/gnuwin32/file/5.03/file-5.03-bin.zip", + "https://downloads.sourceforge.net/project/gnuwin32/file/5.03/file-5.03-dep.zip" ], "hash": [ "sha1:fcf8946fd56e64fa34d1a9cff53671e5ff89f3de", diff --git a/bucket/findutils.json b/bucket/findutils.json index d287fad3ee..cc90e01f0b 100644 --- a/bucket/findutils.json +++ b/bucket/findutils.json @@ -4,11 +4,11 @@ "homepage": "http://www.mingw.org/wiki/msys", "license": "GPL-2.0-only", "url": [ - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/findutils/findutils-4.4.2-2/findutils-4.4.2-2-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/findutils/findutils-4.4.2-2/locate-4.4.2-2-msys-1.0.13-bin.tar.lzma" + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/findutils/findutils-4.4.2-2/findutils-4.4.2-2-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/findutils/findutils-4.4.2-2/locate-4.4.2-2-msys-1.0.13-bin.tar.lzma" ], "hash": [ "sha1:fff020614bd796697739887c636f15a42b4b14aa", diff --git a/bucket/grep.json b/bucket/grep.json index 8fd68270b7..e921b5429e 100644 --- a/bucket/grep.json +++ b/bucket/grep.json @@ -4,8 +4,8 @@ "homepage": "http://gnuwin32.sourceforge.net/packages/grep.htm", "license": "GPL-2.0-only", "url": [ - "https://downloads.sourceforge.net/projects/gnuwin32/grep/2.5.4/grep-2.5.4-bin.zip", - "https://downloads.sourceforge.net/projects/gnuwin32/grep/2.5.4/grep-2.5.4-dep.zip" + "https://downloads.sourceforge.net/project/gnuwin32/grep/2.5.4/grep-2.5.4-bin.zip", + "https://downloads.sourceforge.net/project/gnuwin32/grep/2.5.4/grep-2.5.4-dep.zip" ], "hash": [ "sha1:56f41d351b3ed8ac671df4dd3bbd4c4d3b9190a2", diff --git a/bucket/gzip.json b/bucket/gzip.json index 86a621f13c..0b35132e84 100644 --- a/bucket/gzip.json +++ b/bucket/gzip.json @@ -4,8 +4,8 @@ "homepage": "http://www.mingw.org/wiki/msys", "license": "GPL-2.0-only", "url": [ - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gzip/gzip-1.3.12-2/gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma" + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/gzip/gzip-1.3.12-2/gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma" ], "hash": [ "sha1:a8954ccefa9732cd16b68e2fb50bfef281465c78", diff --git a/bucket/iconv.json b/bucket/iconv.json index bdf2abea44..8193853be8 100644 --- a/bucket/iconv.json +++ b/bucket/iconv.json @@ -4,13 +4,13 @@ "homepage": "http://www.mingw.org/", "license": "GPL-3.0-or-later", "url": [ - "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma" + "https://downloads.sourceforge.net/project/mingw/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma" ], "hash": [ "sha1:ce3c2e774ff1717a7540b5a75ac87cf486bc1117", diff --git a/bucket/patch.json b/bucket/patch.json index b14cd4fd57..0026ac5bc1 100644 --- a/bucket/patch.json +++ b/bucket/patch.json @@ -4,8 +4,8 @@ "homepage": "http://www.mingw.org/wiki/MSYS", "license": "GPL-2.0-only", "url": [ - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/patch/patch-2.6.1-1/patch-2.6.1-1-msys-1.0.13-bin.tar.lzma" + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Extension/patch/patch-2.6.1-1/patch-2.6.1-1-msys-1.0.13-bin.tar.lzma" ], "hash": [ "sha1:36d52ca7066eb6ad0da68c6f31214416f4c9dcec", diff --git a/bucket/sed.json b/bucket/sed.json index 62f8c9b1d7..267443c8ee 100644 --- a/bucket/sed.json +++ b/bucket/sed.json @@ -4,8 +4,8 @@ "homepage": "http://gnuwin32.sourceforge.net/packages/sed.htm", "license": "GPL-2.0-only", "url": [ - "https://downloads.sourceforge.net/projects/gnuwin32/sed/4.2.1/sed-4.2.1-bin.zip", - "https://downloads.sourceforge.net/projects/gnuwin32/sed/4.2.1/sed-4.2.1-dep.zip" + "https://downloads.sourceforge.net/project/gnuwin32/sed/4.2.1/sed-4.2.1-bin.zip", + "https://downloads.sourceforge.net/project/gnuwin32/sed/4.2.1/sed-4.2.1-dep.zip" ], "hash": [ "sha1:dfd3d1dae27a24784d7ab40eb074196509fa48fe", diff --git a/bucket/tar.json b/bucket/tar.json index be6ea937a4..cbbfd7b44e 100644 --- a/bucket/tar.json +++ b/bucket/tar.json @@ -5,11 +5,11 @@ "license": "GPL-2.0-only", "depends": "gzip", "url": [ - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/libiconv/libiconv-1.14-1/libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gettext/gettext-0.18.1.1-1/libintl-0.18.1.1-1-msys-1.0.17-dll-8.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/regex/regex-1.20090805-2/libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma" + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/libiconv/libiconv-1.14-1/libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/gettext/gettext-0.18.1.1-1/libintl-0.18.1.1-1-msys-1.0.17-dll-8.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/regex/regex-1.20090805-2/libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma" ], "hash": [ "sha1:1791b71ad8573612049a8a4821d93e870fb2ae38", diff --git a/bucket/telnet.json b/bucket/telnet.json index 2777cc1267..7fec6c1d74 100644 --- a/bucket/telnet.json +++ b/bucket/telnet.json @@ -4,12 +4,12 @@ "homepage": "http://www.mingw.org/wiki/msys", "license": "GPL-2.0", "url": [ - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/termcap/termcap-0.20050421_1-2/termcap-0.20050421_1-2-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/minires/minires-1.02_1-2/libminires-1.02_1-2-msys-1.0.13-dll.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/bison/bison-2.4.2-1/bison-2.4.2-1-msys-1.0.13-rtm.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys-1.0.13-bin.tar.lzma", - "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys.RELEASE_NOTES.txt" + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Base/termcap/termcap-0.20050421_1-2/termcap-0.20050421_1-2-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Extension/minires/minires-1.02_1-2/libminires-1.02_1-2-msys-1.0.13-dll.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Extension/bison/bison-2.4.2-1/bison-2.4.2-1-msys-1.0.13-rtm.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys-1.0.13-bin.tar.lzma", + "https://downloads.sourceforge.net/project/mingw/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys.RELEASE_NOTES.txt" ], "hash": [ "sha1:fff020614bd796697739887c636f15a42b4b14aa", diff --git a/bucket/which.json b/bucket/which.json index 0377acf728..9c4ad03cd6 100644 --- a/bucket/which.json +++ b/bucket/which.json @@ -3,11 +3,11 @@ "description": "Show the full path of command.", "homepage": "http://gnuwin32.sourceforge.net/packages/which.htm", "license": "GPL-2.0-only", - "url": "https://downloads.sourceforge.net/projects/gnuwin32/which/2.20/which-2.20-bin.zip", + "url": "https://downloads.sourceforge.net/project/gnuwin32/which/2.20/which-2.20-bin.zip", "hash": "sha1:385990045d755bb910d2c30b9697faf36d61e37e", "bin": "bin\\which.exe", "checkver": "(?smi)Version\\s+

([\\d\\.]+)", "autoupdate": { - "url": "https://downloads.sourceforge.net/projects/gnuwin32/which/$version/which-$version-bin.zip" + "url": "https://downloads.sourceforge.net/project/gnuwin32/which/$version/which-$version-bin.zip" } }