From 038c48e9f9522506f6f3a6d25509fff76174d71b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Apr 2021 21:41:45 +0000 Subject: remove wget.universal-darwin, better to rely on system-provided curl for sll git-svn-id: svn://tug.org/texlive/trunk@58977 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/wget/wget.universal-darwin | Bin 991776 -> 0 bytes Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 10 ++++++---- Master/tlpkg/tlpsrc/texlive.infra.tlpsrc | 14 ++++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) delete mode 100755 Master/tlpkg/installer/wget/wget.universal-darwin (limited to 'Master') diff --git a/Master/tlpkg/installer/wget/wget.universal-darwin b/Master/tlpkg/installer/wget/wget.universal-darwin deleted file mode 100755 index bfc7fdec02f..00000000000 Binary files a/Master/tlpkg/installer/wget/wget.universal-darwin and /dev/null differ diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index b8c537c2d6e..edf94aecd55 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -32,17 +32,19 @@ binpattern f/${wndws} tlpkg/installer/wget/wget.exe binpattern f/${wndws} tlpkg/installer/xz/xz.exe binpattern f/${wndws} install-tl-windows.bat binpattern f/${wndws} install-tl-advanced.bat -# + # xz binaries for all binpattern f tlpkg/installer/xz/xz.${ARCH} -# -# platforms for which we do not provide wget, because it is part of the -# normal system install (this list is duplicated in texlive.infra): + +# platforms for which we do not provide wget, because it, or curl, is +# part of the normal system install (this list is duplicated in +# texlive.infra, keep it in sync): binpattern f/!\ aarch64-linux,\ armhf-linux,\ i386-cygwin,\ i386-linux,\ +universal-darwin,\ x86_64-cygwin,\ x86_64-linux\ tlpkg/installer/wget/wget.${ARCH} diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc index ca058d788b2..16a7b32d3ca 100644 --- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc +++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc @@ -49,25 +49,27 @@ binpattern f/win32 tlpkg/installer/wget/wget.exe binpattern f/win32 tlpkg/installer/lz4/lz4.exe binpattern f/win32 tlpkg/installer/curl/curl.exe binpattern f/win32 tlpkg/installer/curl/curl-ca-bundle.crt -# + +# xz. binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH} binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe # binpattern f/!x86_64-cygwin tlpkg/installer/xz/xz.${ARCH} binpattern f/x86_64-cygwin tlpkg/installer/xz/xz.x86_64-cygwin.exe -# -# platforms for which we do not provide wget, because it is part of the -# normal system install (this list is duplicated in 00texlive.installer): + +# platforms for which we do not provide wget, because it, or curl, is +# part of the normal system install (this list is duplicated in +# 00texlive.installer, keep it in sync): binpattern f/!\ aarch64-linux,\ armhf-linux,\ i386-cygwin,\ i386-linux,\ +universal-darwin,\ x86_64-cygwin,\ x86_64-linux\ tlpkg/installer/wget/wget.${ARCH} -# -# + # platforms for which we have lz4, including cygwin special cases. binpattern f/i386-cygwin tlpkg/installer/lz4/lz4.i386-cygwin.exe binpattern f/x86_64-cygwin tlpkg/installer/lz4/lz4.x86_64-cygwin.exe -- cgit v1.2.3