From c36144bab34398e0a318cfd9c23587d45695a095 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 6 Jun 2025 21:57:16 -0500 Subject: [PATCH] Linux setup scripts should use quotes around absolute paths to support spaces in pathname --- tools/lib/setup-common.sh | 12 ++++++------ tools/setup-debug.sh | 2 +- tools/setup-multi.sh | 2 +- tools/setup-release.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/lib/setup-common.sh b/tools/lib/setup-common.sh index a19d2fab..76c5230e 100755 --- a/tools/lib/setup-common.sh +++ b/tools/lib/setup-common.sh @@ -2,7 +2,7 @@ script_dir="$(dirname "$(readlink -f "$0")")" # Import common paths -source ${script_dir}/common-paths.sh +source "${script_dir}/common-paths.sh" # Activate Python Virtual Environment if [ -n "${venv_path:-}" ]; then @@ -23,26 +23,26 @@ fi # Install Python packages python -m pip install ${PIP_FLAGS} pip -pip install ${PIP_FLAGS} -r ${script_dir}/../../requirements.txt +pip install ${PIP_FLAGS} -r "${script_dir}/../../requirements.txt" if [[ -n "${build_type}" ]]; then # Install Conan profile and packages - ${script_dir}/setup-conan.sh + "${script_dir}/setup-conan.sh" else # Install Conan profile and debug packages export build_type=Debug - ${script_dir}/setup-conan.sh + "${script_dir}/setup-conan.sh" # Install Conan profile and release packages export build_type=Release - ${script_dir}/setup-conan.sh + "${script_dir}/setup-conan.sh" # Unset build_type unset build_type fi # Run CMake Configure -${script_dir}/run-cmake-configure.sh +"${script_dir}/run-cmake-configure.sh" # Deactivate Python Virtual Environment if [ -n "${venv_path:-}" ]; then diff --git a/tools/setup-debug.sh b/tools/setup-debug.sh index 6c17caba..ebfba62c 100755 --- a/tools/setup-debug.sh +++ b/tools/setup-debug.sh @@ -12,4 +12,4 @@ export qt_arch=gcc_64 [ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")" # Perform common setup -${script_dir}/lib/setup-common.sh +"${script_dir}/lib/setup-common.sh" diff --git a/tools/setup-multi.sh b/tools/setup-multi.sh index f18bd5ac..05a6cad5 100755 --- a/tools/setup-multi.sh +++ b/tools/setup-multi.sh @@ -15,4 +15,4 @@ echo "Ninja Multi-Config is not supported in Linux" read -p "Press Enter to continue..." # Perform common setup -# ${script_dir}/lib/setup-common.sh +# "${script_dir}/lib/setup-common.sh" diff --git a/tools/setup-release.sh b/tools/setup-release.sh index c55e75c7..04dbc8e6 100755 --- a/tools/setup-release.sh +++ b/tools/setup-release.sh @@ -12,4 +12,4 @@ export qt_arch=gcc_64 [ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")" # Perform common setup -${script_dir}/lib/setup-common.sh +"${script_dir}/lib/setup-common.sh"