From c263df1ead95adace0aedbaaec542b6dc5dbe272 Mon Sep 17 00:00:00 2001 From: Luchang Jin Date: Thu, 9 Jan 2025 12:56:20 -0500 Subject: [PATCH] small fix to download-core --- .github/workflows/qlat.yml | 6 +++--- qcore/setenv.sh | 3 +++ scripts/download-core.sh | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/qlat.yml b/.github/workflows/qlat.yml index d0f07fb74..135f63f12 100644 --- a/.github/workflows/qlat.yml +++ b/.github/workflows/qlat.yml @@ -331,7 +331,7 @@ jobs: - name: Install Brew packages run: | # brew update - brew install llvm autoconf automake coreutils flock findutils pkg-config + brew install llvm autoconf automake coreutils flock findutils pkg-config gnu-sed brew install open-mpi ninja patchelf eigen gsl zlib openssl@3 mpfr brew install fftw # brew upgrade @@ -385,7 +385,7 @@ jobs: - name: Install Brew packages run: | # brew update - brew install llvm autoconf automake coreutils flock findutils pkg-config + brew install llvm autoconf automake coreutils flock findutils pkg-config gnu-sed brew install open-mpi ninja patchelf eigen gsl zlib openssl@3 mpfr brew install fftw # brew upgrade @@ -490,7 +490,7 @@ jobs: - name: Install Brew packages run: | # brew update - brew install llvm autoconf automake coreutils flock findutils pkg-config + brew install llvm autoconf automake coreutils flock findutils pkg-config gnu-sed brew install open-mpi ninja patchelf eigen gsl zlib openssl@3 mpfr brew install fftw # brew upgrade diff --git a/qcore/setenv.sh b/qcore/setenv.sh index c9d8972ca..86b767f9d 100644 --- a/qcore/setenv.sh +++ b/qcore/setenv.sh @@ -12,6 +12,9 @@ if [ "$(uname)" == "Darwin" ]; then if [ -e "$(brew --prefix)/opt/coreutils/libexec/gnubin" ]; then export PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin":"$PATH" fi + if [ -e "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" ]; then + export PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin":"$PATH" + fi if [ -e "$(brew --prefix)/opt/llvm/bin" ]; then export PATH="$(brew --prefix)/opt/llvm/bin":"$PATH" fi diff --git a/scripts/download-core.sh b/scripts/download-core.sh index f20995558..a270d173e 100755 --- a/scripts/download-core.sh +++ b/scripts/download-core.sh @@ -91,7 +91,7 @@ fi if [ -e Grid-tblum/configure ] ; then echo "Grid-tblum bootstrapped." else - ( cd Grid-tblum ; git clean -f ; sed -i 's/gsha256sum/sha256sum/g' bootstrap.sh ; ./bootstrap.sh || true ; ls -l Eigen || true ; git checkout bootstrap.sh ) + ( cd Grid-tblum ; git clean -f ; if command -v gsha256sum ; then echo OK ; else sed -i 's/gsha256sum/sha256sum/g' bootstrap.sh || true ; fi ; ./bootstrap.sh || true ; ls -l Eigen || true ; git checkout bootstrap.sh || true ) fi if [ -d Hadrons-tblum ] ; then