Merge branch 'main' into go/affonsov-cluster-multidb-support

yipin-chen · web-flow · commit 77df838ab268 · 2025-08-27T11:53:30.000-07:00
diff --git a/benchmarks/install_and_test.sh b/benchmarks/install_and_test.sh
@@ -106,7 +106,7 @@ function fillDB(){
 }
 
 utilitiesDir=`pwd`/utilities
-script=`pwd`/${BASH_SOURCE[0]}
+script="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")"
 RELATIVE_BENCH_PATH=`dirname ${script}`
 export BENCH_FOLDER=`realpath ${RELATIVE_BENCH_PATH}`
 export PYTHON_FOLDER="${BENCH_FOLDER}/../python"

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ function fillDB(){`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	utilitiesDir=`pwd`/utilities
`109`		-script=`pwd`/${BASH_SOURCE[0]}
	`109`	`+script="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")"`
`110`	`110`	RELATIVE_BENCH_PATH=`dirname ${script}`
`111`	`111`	export BENCH_FOLDER=`realpath ${RELATIVE_BENCH_PATH}`
`112`	`112`	`export PYTHON_FOLDER="${BENCH_FOLDER}/../python"`