Fix generation of env.sh for ZSH (#435)

ucb-bar · Feb 15, 2020 · 9d45a27 · 9d45a27
1 parent 7bcedfa
commit 9d45a27
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
@@ -141,5 +141,5 @@ cd "$RDIR"
 } > env-$TOOLCHAIN.sh
 
 # create general env.sh
-echo "source \$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/env-$TOOLCHAIN.sh" >> env.sh
+echo "source \$( realpath \$(dirname "\${BASH_SOURCE[0]:-\${\(%\):-%x}}") )/env-$TOOLCHAIN.sh" >> env.sh
 echo "Toolchain Build Complete!"
diff --git a/scripts/firesim-setup.sh b/scripts/firesim-setup.sh
@@ -6,7 +6,7 @@ set -e
 set -o pipefail
 
 RDIR=$(pwd)
-scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" >/dev/null 2>&1 && pwd )"
 
 cd "${scripts_dir}/.."
 

diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh
@@ -60,4 +60,4 @@ git submodule update --init software/firemarshal
 if [ ! -f $RDIR/software/firemarshal/marshal-config.yaml ]; then
   echo "firesim-dir: '../../sims/firesim/'" > $RDIR/software/firemarshal/marshal-config.yaml
 fi
-echo "PATH=\$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/software/firemarshal:\$PATH" >> $RDIR/env.sh
+echo "PATH=\$( realpath \$(dirname "\${BASH_SOURCE[0]:-\${\(%\):-%x}}") )/software/firemarshal:\$PATH" >> $RDIR/env.sh