blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-29 20:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linux setup scripts should use quotes around absolute paths to support spaces in pathname

Browse source
This commit is contained in:
Dan Paulat 2025-06-06 21:57:16 -05:00
parent ad65bcf424
commit c36144bab3
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/lib/setup-common.sh
View file

@ -2,7 +2,7 @@
script_dir="$(dirname "$(readlink -f "$0")")" script_dir="$(dirname "$(readlink -f "$0")")"
# Import common paths # Import common paths
source ${script_dir}/common-paths.sh source "${script_dir}/common-paths.sh"
# Activate Python Virtual Environment # Activate Python Virtual Environment
if [ -n "${venv_path:-}" ]; then if [ -n "${venv_path:-}" ]; then
@ -23,26 +23,26 @@ fi
# Install Python packages # Install Python packages
python -m pip install ${PIP_FLAGS} pip 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 if [[ -n "${build_type}" ]]; then
# Install Conan profile and packages # Install Conan profile and packages
${script_dir}/setup-conan.sh "${script_dir}/setup-conan.sh"
else else
# Install Conan profile and debug packages # Install Conan profile and debug packages
export build_type=Debug export build_type=Debug
${script_dir}/setup-conan.sh "${script_dir}/setup-conan.sh"
# Install Conan profile and release packages # Install Conan profile and release packages
export build_type=Release export build_type=Release
${script_dir}/setup-conan.sh "${script_dir}/setup-conan.sh"
# Unset build_type # Unset build_type
unset build_type unset build_type
fi fi
# Run CMake Configure # Run CMake Configure
${script_dir}/run-cmake-configure.sh "${script_dir}/run-cmake-configure.sh"
# Deactivate Python Virtual Environment # Deactivate Python Virtual Environment
if [ -n "${venv_path:-}" ]; then if [ -n "${venv_path:-}" ]; then

2
tools/setup-debug.sh
View file

@ -12,4 +12,4 @@ export qt_arch=gcc_64
[ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")" [ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")"
# Perform common setup # Perform common setup
${script_dir}/lib/setup-common.sh "${script_dir}/lib/setup-common.sh"

2
tools/setup-multi.sh
View file

@ -15,4 +15,4 @@ echo "Ninja Multi-Config is not supported in Linux"
read -p "Press Enter to continue..." read -p "Press Enter to continue..."
# Perform common setup # Perform common setup
# ${script_dir}/lib/setup-common.sh # "${script_dir}/lib/setup-common.sh"

2
tools/setup-release.sh
View file

@ -12,4 +12,4 @@ export qt_arch=gcc_64
[ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")" [ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")"
# Perform common setup # Perform common setup
${script_dir}/lib/setup-common.sh "${script_dir}/lib/setup-common.sh"