Merge pull request #8256 from Agoric/mfig-tweak-agd

fix(agd): make script more robust
Agoric · Aug 27, 2023 · 2f87d77 · 2f87d77
2 parents ad99406 + ce7d183
commit 2f87d77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
 }