From 38313cadf4837945b2266e973fbb3ab57fb85db8 Mon Sep 17 00:00:00 2001 From: Philip Sakievich Date: Tue, 8 Nov 2022 23:40:03 -0700 Subject: [PATCH] Revert "avoid using realpath, readlink -f is more portable" This reverts commit 2cae95334cfecd045f35b0787172dc606a7b5b31. --- share/spack/qa/setup.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/share/spack/qa/setup.sh b/share/spack/qa/setup.sh index 9f230f0819c..ad834fd4c51 100755 --- a/share/spack/qa/setup.sh +++ b/share/spack/qa/setup.sh @@ -11,12 +11,7 @@ # QA_DIR="$(dirname ${BASH_SOURCE[0]})" -if realpath $QA_DIR >& /dev/null ; then - REALPATH=realpath -else - REALPATH="readlink -f --" -fi -export SPACK_ROOT=$($REALPATH "$QA_DIR/../../..") +export SPACK_ROOT=$(realpath "$QA_DIR/../../..") # Source the setup script . "$SPACK_ROOT/share/spack/setup-env.sh" @@ -33,7 +28,7 @@ if [[ "$COVERAGE" == "true" ]]; then # bash coverage depends on some other factors mkdir -p coverage - bashcov=$($REALPATH ${QA_DIR}/bashcov) + bashcov=$(realpath ${QA_DIR}/bashcov) # instrument scripts requiring shell coverage sed -i "s@#\!/bin/bash@#\!${bashcov}@" "$SPACK_ROOT/lib/spack/env/cc"