Merge pull request #3408 from IntersectMBO/use_dirname

mkoura · web-flow · commit c962da2833ec · 2026-04-13T13:53:53.000+02:00
chore(scripts): use dirname for script dir resolution
diff --git a/.source.dev b/.source.dev
@@ -13,7 +13,7 @@
   return 1
 }
 
-_root_dir_cnt="$(cd "${BASH_SOURCE[0]%/*}" && pwd)" || { echo "Cannot determine root dir, returning." >&2; return 1; }
+_root_dir_cnt="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || { echo "Cannot determine root dir, returning." >&2; return 1; }
 
 # Source additional environment variables from .env.sh
 if [ -e "$_root_dir_cnt/.env.sh" ]; then
diff --git a/cardano_node_tests/cluster_scripts/testnets/start-cluster b/cardano_node_tests/cluster_scripts/testnets/start-cluster
@@ -4,7 +4,7 @@ set -Eeuo pipefail
 trap 'echo "Error at line $LINENO"' ERR
 
 TESTNET_DIR="${1:?"Testnet dir needed"}"
-SCRIPT_DIR="$(cd "${0%/*}" && pwd)" || { echo "Cannot determine SCRIPT_DIR, exiting." >&2; exit 1; }
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" || { echo "Cannot determine SCRIPT_DIR, exiting." >&2; exit 1; }
 SOCKET_PATH="$(readlink -m "$CARDANO_NODE_SOCKET_PATH")"
 STATE_CLUSTER="${SOCKET_PATH%/*}"
 # Fail if PWD is STATE_CLUSTER, as STATE_CLUSTER will be deleted
@@ -143,7 +143,7 @@ cat > "$STATE_CLUSTER/supervisord_start" <<EoF
 
 set -uo pipefail
 
-SCRIPT_DIR="\$(cd "\${0%/*}" && pwd)" || { echo "Cannot determine SCRIPT_DIR, exiting." >&2; exit 1; }
+SCRIPT_DIR="\$(cd "\$(dirname "\$0")" && pwd)" || { echo "Cannot determine SCRIPT_DIR, exiting." >&2; exit 1; }
 
 cd "\$SCRIPT_DIR/.."
 
@@ -155,7 +155,7 @@ cat > "$STATE_CLUSTER/stop-cluster" <<EoF
 
 set -uo pipefail
 
-SCRIPT_DIR="\$(cd "\${0%/*}" && pwd)" || { echo "Cannot determine SCRIPT_DIR, exiting." >&2; exit 1; }
+SCRIPT_DIR="\$(cd "\$(dirname "\$0")" && pwd)" || { echo "Cannot determine SCRIPT_DIR, exiting." >&2; exit 1; }
 PID_FILE="\$SCRIPT_DIR/supervisord.pid"
 SUPERVISORD_SOCKET_PATH="${SUPERVISORD_SOCKET_PATH}"
 
diff --git a/runner/cli_coverage.sh b/runner/cli_coverage.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-tests_repo="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine test repo dir, exiting." >&2; exit 1; }
+tests_repo="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine test repo dir, exiting." >&2; exit 1; }
 
 get_coverage() {
   if [ "$(echo "$tests_repo"/.cli_coverage/*)" = "$tests_repo/.cli_coverage/*" ] || ! command -v cardano-cli >/dev/null 2>&1; then
diff --git a/runner/create_results.sh b/runner/create_results.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-tests_repo="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine tests repo dir, exiting." >&2; exit 1; }
+tests_repo="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine tests repo dir, exiting." >&2; exit 1; }
 reports_dir="$tests_repo/.reports"
 if [ "$(echo "$reports_dir"/*.json)" = "$reports_dir/*.json" ]; then
   echo "No reports found in $reports_dir" >&2
diff --git a/runner/node_upgrade.sh b/runner/node_upgrade.sh
@@ -23,7 +23,7 @@ df -h .
 
 retval=0
 
-REPODIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine repo dir, exiting." >&2; exit 1; }
+REPODIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine repo dir, exiting." >&2; exit 1; }
 export REPODIR
 cd "$REPODIR"
 
diff --git a/runner/regression.sh b/runner/regression.sh
@@ -13,7 +13,7 @@ df -h .
 
 retval=0
 
-REPODIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine repo dir, exiting." >&2; exit 1; }
+REPODIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine repo dir, exiting." >&2; exit 1; }
 cd "$REPODIR"
 
 export WORKDIR="$REPODIR/run_workdir"
diff --git a/runner/reqs_coverage.sh b/runner/reqs_coverage.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 ARTIFACTS_DIR="${ARTIFACTS_DIR:-".artifacts"}"
 
-tests_repo="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine tests repo dir, exiting." >&2; exit 1; }
+tests_repo="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine tests repo dir, exiting." >&2; exit 1; }
 
 get_coverage() {
   if [ ! -e "$ARTIFACTS_DIR" ]; then
diff --git a/runner/run_tests.sh b/runner/run_tests.sh
@@ -37,7 +37,7 @@ ARTIFACTS_DIR="${ARTIFACTS_DIR:-.artifacts}"
 COVERAGE_DIR="${COVERAGE_DIR:-.cli_coverage}"
 REPORTS_DIR="${REPORTS_DIR:-.reports}"
 
-_TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+_TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 # shellcheck disable=SC1091
 . "$_TOP_DIR/scripts/common.sh"
 
diff --git a/runner/setup_venv.sh b/runner/setup_venv.sh
@@ -6,7 +6,7 @@
 }
 
 _VENV_DIR="${_VENV_DIR:-"${WORKDIR:?}/.venv"}"
-_TOP_DIR="$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)" || { echo "Cannot determine top dir, returning." >&2; return 1; }
+_TOP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" || { echo "Cannot determine top dir, returning." >&2; return 1; }
 
 if [ "${1:-""}" = "clean" ]; then
   rm -rf "$_VENV_DIR"
diff --git a/scripts/check_dev_env.sh b/scripts/check_dev_env.sh
@@ -4,7 +4,7 @@
 
 set -uo pipefail
 
-_TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+_TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 # shellcheck disable=SC1091
 . "$_TOP_DIR/scripts/common.sh"
 
diff --git a/scripts/reinstall_editable.sh b/scripts/reinstall_editable.sh
@@ -11,7 +11,7 @@ if [ $# -ne 1 ]; then
 fi
 REPO_PATH="$(readlink -f "$1")"
 
-TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 cd "$TOP_DIR"
 
 # Activate python virtual environment
diff --git a/scripts/restart_dev_cluster.sh b/scripts/restart_dev_cluster.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 # shellcheck disable=SC1091
 . "$TOP_DIR/scripts/common.sh"
 
diff --git a/scripts/setup_test_env.sh b/scripts/setup_test_env.sh
@@ -24,7 +24,7 @@ case "${1:-""}" in
 esac
 
 ORIG_PWD="$PWD"
-REPODIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine repo dir, exiting." >&2; exit 1; }
+REPODIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine repo dir, exiting." >&2; exit 1; }
 export WORKDIR="$REPODIR/dev_workdir"
 
 if [ "$ORIG_PWD" = "$WORKDIR" ]; then
diff --git a/scripts/test_block_production.sh b/scripts/test_block_production.sh
@@ -5,7 +5,7 @@
 
 set -euo pipefail
 
-TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 
 # The database file will be created if missing
 if [ -z "${BLOCK_PRODUCTION_DB:-}" ]; then
diff --git a/scripts/test_node_reconnect.sh b/scripts/test_node_reconnect.sh
@@ -6,7 +6,7 @@
 
 set -euo pipefail
 
-TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 
 export \
   CLUSTERS_COUNT=1 \
diff --git a/scripts/test_rollbacks.sh b/scripts/test_rollbacks.sh
@@ -13,7 +13,7 @@
 
 set -euo pipefail
 
-TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 
 export NUM_POOLS="${NUM_POOLS:-"10"}" CLUSTERS_COUNT=1 TEST_THREADS=0
 
diff --git a/scripts/update_node_bins.sh b/scripts/update_node_bins.sh
@@ -15,7 +15,7 @@ if [ $# -ne 1 ]; then
 fi
 REPO_PATH="$(readlink -f "$1")"
 
-TOP_DIR="$(cd "${0%/*}/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
+TOP_DIR="$(cd "$(dirname "$0")/.." && pwd)" || { echo "Cannot determine top dir, exiting." >&2; exit 1; }
 BUILD_OUTPUT_DIR="$REPO_PATH/.nix_tests_bins"
 BIN_DIR="$TOP_DIR/.bin_node"
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`return 1`
`14`	`14`	`}`
`15`	`15`
`16`		`-_root_dir_cnt="$(cd "${BASH_SOURCE[0]%/*}" && pwd)" \|\| { echo "Cannot determine root dir, returning." >&2; return 1; }`
	`16`	`+_root_dir_cnt="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" \|\| { echo "Cannot determine root dir, returning." >&2; return 1; }`
`17`	`17`
`18`	`18`	`# Source additional environment variables from .env.sh`
`19`	`19`	`if [ -e "$_root_dir_cnt/.env.sh" ]; then`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`_VENV_DIR="${_VENV_DIR:-"${WORKDIR:?}/.venv"}"`
`9`		`-_TOP_DIR="$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)" \|\| { echo "Cannot determine top dir, returning." >&2; return 1; }`
	`9`	`+_TOP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" \|\| { echo "Cannot determine top dir, returning." >&2; return 1; }`
`10`	`10`
`11`	`11`	`if [ "${1:-""}" = "clean" ]; then`
`12`	`12`	`rm -rf "$_VENV_DIR"`