install and use GNU sed (gsed) on MacOS

FStarLang · Apr 10, 2023 · a92641b · a92641b
1 parent f8c4825
commit a92641b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/setup-macos.sh b/.github/setup-macos.sh
@@ -3,7 +3,7 @@
 # Install OCaml and other GNU build tools
 # coreutils: for the `install` command used in install-ulib.sh
 export OPAMYES=1
-brew install opam bash gnu-getopt coreutils
+brew install opam bash gnu-getopt coreutils gnu-sed
 opam init --compiler=4.12.0
 eval $(opam env)
 

diff --git a/.scripts/publish_release.sh b/.scripts/publish_release.sh
@@ -16,7 +16,8 @@ pushd "$FSTAR_HOST_HOME"
 
 echo "*** Rename package ***"
 dev='~dev'
-CURRENT_VERSION=$(cat version.txt | sed 's!'"$dev"'!!' | sed 's!'"\r"'$!!')
+SED=$(which gsed >/dev/null 2>&1 && echo gsed || echo sed)
+CURRENT_VERSION=$(cat version.txt | $SED 's!'"$dev"'!!' | $SED 's!'"\r"'$!!')
 my_tag="v$CURRENT_VERSION"
 if [[ -z $OS ]] ; then
     OS=$(uname)

diff --git a/.scripts/release.sh b/.scripts/release.sh
@@ -24,8 +24,9 @@ fi
 cd "$FSTAR_HOST_HOME"
 
 # Strip the ~dev part of the version number
+SED=$(which gsed >/dev/null 2>&1 && echo gsed || echo sed)
 dev='~dev'
-sed -i 's!'"$dev"'!!' version.txt
+$SED -i 's!'"$dev"'!!' version.txt
 
 # Build the package
 if [[ -z "$CI_THREADS" ]] ; then