From ce7d183cd5f292a27863faac65831e2b781504aa Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Fri, 25 Aug 2023 13:44:56 -0600 Subject: [PATCH] fix(agd): make script more robust --- bin/agd | 2 +- repoconfig.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/agd b/bin/agd index e6a922b3476..a1496829770 100755 --- a/bin/agd +++ b/bin/agd @@ -148,7 +148,7 @@ fi print=() fi print+=( -print ) - src=$(find "$GOLANG_DIR" \( -name '*.go' -o -name 'go.*' \) "${print[@]}" | head -1 || true) + src=$(find "$GOLANG_DIR" \( ! -name '*_test.go' -name '*.go' -o -name 'go.*' \) "${print[@]}" | head -1 || true) test -z "$src" || { echo "At least $src is newer than $stamp" diff --git a/repoconfig.sh b/repoconfig.sh index 755ca3d1b1b..14194defb79 100644 --- a/repoconfig.sh +++ b/repoconfig.sh @@ -7,10 +7,12 @@ GOLANG_DAEMON=$GOLANG_DIR/build/agd XSNAP_VERSION=agoric-upgrade-10 # Args are major, minor and patch version numbers -function golang_version_check() { - [ $1 -eq 1 ] && [ $2 -eq 20 ] && [ $3 -ge 2 ] && return 0 - [ $1 -eq 1 ] && [ $2 -ge 21 ] && return 0 - [ $1 -ge 2 ] && return 0 - echo "need go version 1.20.2+, 1.21+, or 2+" +golang_version_check() { + { + [ "$1" -eq 1 ] && [ "$2" -eq 20 ] && [ "$3" -ge 2 ] && return 0 + [ "$1" -eq 1 ] && [ "$2" -ge 21 ] && return 0 + [ "$1" -ge 2 ] && return 0 + } 2>/dev/null + echo 1>&2 "need go version 1.20.2+, 1.21+, or 2+" return 1 }