mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-29 20:40:05 +00:00
Linux setup scripts should use quotes around absolute paths to support spaces in pathname
This commit is contained in:
parent
ad65bcf424
commit
c36144bab3
4 changed files with 9 additions and 9 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue