From e59d6fb3b4008536ee57865d64372a42a9c93277 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Brian Inglis Date: Fri, 27 Oct 2023 13:25:20 -0600 Subject: [PATCH 1/7] support better compressed setup.xz instead of bz2 Signed-off-by: Brian Inglis --- cygcheck-dep | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cygcheck-dep b/cygcheck-dep index 15c6be5a7193..72e345f80987 100644 --- a/cygcheck-dep +++ b/cygcheck-dep @@ -610,24 +610,24 @@ mach="${MACHTYPE%%-*}" ## download file /* cw_setup_ini="$cache_dir/cygwin/$mach/setup.ini" if ! [ "$opt_use_cached_setup_ini" ] || [ "$cmd_show_updates" ]; then - cw_setup_bz2_url="ftp://sourceware.org/pub/cygwin/$mach/setup.bz2" + cw_setup_url="https://cygwin.com/pub/cygwin/$mach/setup.xz" [ "$opt_be_more_verbose" ] && opt_wget_verbosity="-nv" || opt_wget_verbosity="-q" - if ! wget >&2 "$opt_wget_verbosity" -r -nH --cut-dirs 1 -P "$cache_dir" "$cw_setup_bz2_url"; then + if ! wget >&2 "$opt_wget_verbosity" -r -nH --cut-dirs 1 -P "$cache_dir" "$cw_setup_url"; then echo >&2 "$0: failed to download file:" - echo >&2 "$0: $cw_setup_bz2_url" + echo >&2 "$0: $cw_setup_url" echo >&2 "$0: you may try to run with -c option to use cached file from previous download" exit 4 fi - cw_setup_bz2="$cache_dir/cygwin/$mach/setup.bz2" - if ! bzip2 -t "$cw_setup_bz2"; then + cw_setup="$cache_dir/cygwin/$mach/setup.xz" + if ! unxz -t "$cw_setup"; then echo >&2 "$0: failed to check integrity of downloaded file:" - echo >&2 "$0: $cw_setup_bz2" + echo >&2 "$0: $cw_setup" echo >&2 "$0: you may try to run with -c option to use cached file from previous download" exit 5 fi - if ! bzcat "$cw_setup_bz2" > "$cw_setup_ini"; then + if ! xzcat "$cw_setup" > "$cw_setup_ini"; then echo >&2 "$0: failed to decompress downloaded file:" - echo >&2 "$0: $cw_setup_bz2" + echo >&2 "$0: $cw_setup" exit 6 fi fi -- 2.39.0