Merge pull request #891 from ucb-bar/unfuck-zsh-yet-again

Use a ZSH-compatible version of BASH_SOURCE[0]
ucb-bar · Jun 12, 2021 · ad1c3ff · ad1c3ff
2 parents 022e973 + e196540
commit ad1c3ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
@@ -6,7 +6,9 @@
 set -e
 set -o pipefail
 
-DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+# If BASH_SOURCE is undefined, we may be running under zsh, in that case
+# provide a zsh-compatible alternative
+DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
 CHIPYARD_DIR="$(dirname "$DIR")"
 
 usage() {

diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh
@@ -17,7 +17,9 @@ if [ "$MINGIT" != "$(echo -e "$MINGIT\n$MYGIT" | sort -V | head -n1)" ]; then
   false
 fi
 
-DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+# If BASH_SOURCE is undefined we may be running under zsh, in that case
+# provide a zsh-compatible alternative
+DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
 CHIPYARD_DIR="$(dirname "$DIR")"
 
 cd "$CHIPYARD_DIR"