Setup script cleanup for Linux

tools/lib/run-cmake-configure.bat

@@ -1,19 +1,22 @@
-@echo off
-set script_dir=%~dp0
+@set script_dir=%~dp0
 
-set cmake_args=-B "%build_dir%" -S "%script_dir%\..\.." ^
+@set cmake_args=-B "%build_dir%" -S "%script_dir%\..\.." ^
     -G "%generator%" ^
     -DCMAKE_PREFIX_PATH="%qt_base%/%qt_version%/%qt_arch%" ^
     -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="%script_dir%\..\..\external\cmake-conan\conan_provider.cmake" ^
     -DCONAN_HOST_PROFILE=%conan_profile% ^
     -DCONAN_BUILD_PROFILE=%conan_profile%
 
-if defined build_type (
+@if defined build_type (
     set cmake_args=%cmake_args% ^
         -DCMAKE_BUILD_TYPE=%build_type% ^
         -DCMAKE_CONFIGURATION_TYPES=%build_type%
+) else (
+    :: CMAKE_BUILD_TYPE isn't used to build, but is required by the Conan CMakeDeps generator
+    set cmake_args=%cmake_args% ^
+        -DCMAKE_BUILD_TYPE=Release ^
+        -DCMAKE_CONFIGURATION_TYPES=Debug;Release
 )
-@echo on
 
-mkdir "%build_dir%"
+@mkdir "%build_dir%"
 cmake %cmake_args%

tools/lib/run-cmake-configure.sh

@@ -17,6 +17,12 @@ if [[ -n "${build_type}" ]]; then
         -DCMAKE_CONFIGURATION_TYPES="${build_type}"
         -DCMAKE_INSTALL_PREFIX="${build_dir}/${build_type}/supercell-wx"
     )
+else
+    # CMAKE_BUILD_TYPE isn't used to build, but is required by the Conan CMakeDeps generator
+    cmake_args+=(
+        -DCMAKE_BUILD_TYPE="Release"
+        -DCMAKE_CONFIGURATION_TYPES="Debug;Release"
+    )
 fi
 
 mkdir -p "${build_dir}"

tools/lib/setup-common.sh

@@ -2,26 +2,36 @@
 script_dir="$(dirname "$(readlink -f "$0")")"
 
 # Import common paths
-source ./common-paths.sh
+source ${script_dir}/common-paths.sh
+
+IN_VENV=$(python -c 'import sys; print(sys.prefix != getattr(sys, "base_prefix", sys.prefix))')
+
+if [ "${IN_VENV}" = "True" ]; then
+    # In a virtual environment, don't use --user
+    PIP_FLAGS="--upgrade"
+else
+    # Not in a virtual environment, use --user
+    PIP_FLAGS="--upgrade --user"
+fi
 
 # Install Python packages
-pip install --upgrade --user ${script_dir}/../../requirements.txt
+pip install ${PIP_FLAGS} -r ${script_dir}/../../requirements.txt
 
 if [[ -n "${build_type}" ]]; then
     # Install Conan profile and packages
-    ./setup-conan.sh
+    ${script_dir}/setup-conan.sh
 else
     # Install Conan profile and debug packages
     export build_type=Debug
-    ./setup-conan.sh
+    ${script_dir}/setup-conan.sh
 
     # Install Conan profile and release packages
     export build_type=Release
-    ./setup-conan.sh
+    ${script_dir}/setup-conan.sh
 
     # Unset build_type
     unset build_type
 fi
 
 # Run CMake Configure
-./run-cmake-configure.sh
+${script_dir}/run-cmake-configure.sh