From 6eda52bed331eaa7fbe7b8cfbcc98b8f81bd7a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Dutheillet-Lamonth=C3=A9zie?= Date: Fri, 6 Sep 2024 18:15:45 +0200 Subject: [PATCH] #97: fix syntax in shell scripts --- .github/workflows/build-and-test-macos.yml | 6 +++--- ci/setup_conda.sh | 12 +++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml index f9a4c78a7..7069ca51e 100644 --- a/.github/workflows/build-and-test-macos.yml +++ b/.github/workflows/build-and-test-macos.yml @@ -88,9 +88,9 @@ jobs: - name: Reload environment variables run: | - if [ -f ~/.zshrc ]; then . ~/.zshrc fi - if [ -f ~/.profile ]; then . ~/.profile fi - if [ -f ~/.bashrc ]; then . ~/.bashrc fi + if [ -f ~/.zshrc ]; then . ~/.zshrc; fi + if [ -f ~/.profile ]; then . ~/.profile; fi + if [ -f ~/.bashrc ]; then . ~/.bashrc; fi which conda conda --version conda env list diff --git a/ci/setup_conda.sh b/ci/setup_conda.sh index 1461cb8df..9d89c5c01 100644 --- a/ci/setup_conda.sh +++ b/ci/setup_conda.sh @@ -24,15 +24,9 @@ rm -rf ~/miniconda.sh $CONDA_PATH/bin/conda init bash $CONDA_PATH/bin/conda init zsh -if [ -f ~/.zshrc ]; then -. ~/.zshrc -fi -if [ -f ~/.profile ]; then -. ~/.profile -fi -if [ -f ~/.bashrc ]; then -. ~/.bashrc -fi +if [ -f ~/.zshrc ]; then . ~/.zshrc; fi +if [ -f ~/.profile ]; then . ~/.profile; fi +if [ -f ~/.bashrc ]; then . ~/.bashrc; fi echo "Conda path: $(which conda)" echo "Conda version: $(conda --version)"