From ce75bd703e8f8ca338e8fcd2e4ea62562f7968c2 Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 11 Jun 2024 18:34:27 -0400 Subject: [PATCH] fix --- gha-populate-bin.bash | 6 ++++-- gha/gha.cygpath.bash | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gha-populate-bin.bash b/gha-populate-bin.bash index 47a52cde94..5f12ac121b 100644 --- a/gha-populate-bin.bash +++ b/gha-populate-bin.bash @@ -26,11 +26,13 @@ function get_colout() {( )} function get_parallel() {( - echo "get_parallel..." >&2 + # local mirror=mirror.msys2.org + local mirror=mirror.umd.edu + echo "get_parallel... mirror=$mirror" >&2 set -Euo pipefail local archive=$( wget-sha256 \ 3f9a262cdb7ba9b21c4aa2d6d12e6ccacbaf6106085fdaafd3b8a063e15ea782 \ - https://mirror.msys2.org/msys/x86_64/parallel-20231122-1-any.pkg.tar.zst \ + https://$mirror/msys/x86_64/parallel-20231122-1-any.pkg.tar.zst \ . ) && tar -C bin --strip-components=2 -vxf $archive usr/bin/parallel && { mkdir -pv bin/parallel-home/tmp/sshlogin/`hostname`/ diff --git a/gha/gha.cygpath.bash b/gha/gha.cygpath.bash index f6e3a140a6..ac81a17c55 100644 --- a/gha/gha.cygpath.bash +++ b/gha/gha.cygpath.bash @@ -1,14 +1,15 @@ #!/bin/bash if ! cygpath . >/dev/null 2>/dev/null ; then - test ! -v DEBUG || echo "[$BASH_SOURCE] emulating cygpath $OSTYPE" >&2 + test ! -v DEBUG || echo "[$BASH_SOURCE] emulating cygpath $OSTYPE 1=$1 2=$2" >&2 function cygpath() { case "$1" in - -pm) echo "'$1' / -pm not yet implemented... '$2'" >&2 ; exit 89 ;; - -*p*) echo "'$1' / -p not yet implemented... '$2'" >&2 ; exit 90 ;; + -pm) echo "'$1' / -pm not yet implemented... '$2'" >&2 ; return 89 ;; + -ua) shift ; readlink -f "$1" ;; + -*p*) echo "'$1' / -p not yet implemented... '$2'" >&2 ; return 90 ;; -*a*) shift ; readlink -f "$1" ;; -*m*) shift ; readlink -m "$1" ;; - -*) echo "'$1' not yet implemented... '$2'" >&2 ; exit 90 ;; + -*) echo "'$1' not yet implemented... '$2'" >&2 ; return 99 ;; *) readlink "$1" ;; esac }