Fixes to support PREFIX containing spaces

.github/workflows/main.yml

@@ -116,7 +116,7 @@ jobs:
           source $CONDA/etc/profile.d/conda.sh
           conda activate constructor
           mkdir -p examples_artifacts/
-          python scripts/run_examples.py --keep-artifacts=examples_artifacts/
+          python -u scripts/run_examples.py --keep-artifacts=examples_artifacts/
       - name: Upload the example installers as artifacts
         if: github.event_name == 'pull_request' && matrix.pyver == '3.9'
         uses: actions/upload-artifact@v3

CONSTRUCT.md

@@ -557,8 +557,11 @@ Read notes about the particularities of Windows silent mode `/S` in the
 
 _required:_ no<br/>
 _type:_ boolean<br/>
-Check if the path where the distribution is installed contains spaces and show a warning
-if any spaces are found. Default is True. (Windows only).
+Check if the path where the distribution is installed contains spaces. Default is True.
+To allow installations with spaces, change to False. Note that:
+
+- A recent conda-standalone (>=22.11.1) or equivalent is needed for full support.
+- `conda` cannot be present in the `base` environment
 
 Read notes about the particularities of Windows silent mode `/S` in the
 `installer_type` documentation.

constructor/construct.py

@@ -444,8 +444,11 @@
 '''),
 
     ('check_path_spaces',     False, bool, '''
-Check if the path where the distribution is installed contains spaces and show a warning
-if any spaces are found. Default is True. (Windows only).
+Check if the path where the distribution is installed contains spaces. Default is True.
+To allow installations with spaces, change to False. Note that:
+
+- A recent conda-standalone (>=22.11.1) or equivalent is needed for full support.
+- `conda` cannot be present in the `base` environment
 
 Read notes about the particularities of Windows silent mode `/S` in the
 `installer_type` documentation.

constructor/fcp.py

@@ -367,19 +367,28 @@ def _fetch_precs(precs, download_dir, transmute_file_type=''):
 def _main(name, version, download_dir, platform, channel_urls=(), channels_remap=(), specs=(),
           exclude=(), menu_packages=(), ignore_duplicate_files=True, environment=None,
           environment_file=None, verbose=True, dry_run=False, conda_exe="conda.exe",
-          transmute_file_type='', extra_envs=None):
+          transmute_file_type='', extra_envs=None, check_path_spaces=True):
     precs = _solve_precs(
         name, version, download_dir, platform, channel_urls=channel_urls,
         channels_remap=channels_remap, specs=specs, exclude=exclude,
         menu_packages=menu_packages, environment=environment,
         environment_file=environment_file, verbose=verbose, conda_exe=conda_exe
     )
+    extra_envs = extra_envs or {}
+    conda_in_base: PackageCacheRecord = next((prec for prec in precs if prec.name == "conda"), None)
+    if conda_in_base:
+        if not check_path_spaces and platform.startswith(("linux-", "osx-")):
+            raise RuntimeError(
+                "'check_path_spaces=False' cannot be used on Linux and macOS installers "
+                "if 'conda' is present in the 'base' environment."
+            )
+    elif extra_envs:
+        raise RuntimeError(
+            "conda needs to be present in 'base' environment for 'extra_envs' to work"
+        )
 
     extra_envs_precs = {}
-    for env_name, env_config in (extra_envs or {}).items():
-        if not any(prec.name == "conda" for prec in precs):
-            raise RuntimeError("conda needs to be present in `base` environment for extra_envs to work")
-
+    for env_name, env_config in extra_envs.items():
         if verbose:
             print("Solving extra environment:", env_name)
         extra_envs_precs[env_name] = _solve_precs(
@@ -445,6 +454,7 @@ def main(info, verbose=True, dry_run=False, conda_exe="conda.exe"):
     environment_file = info.get("environment_file", None)
     transmute_file_type = info.get("transmute_file_type", "")
     extra_envs = info.get("extra_envs", {})
+    check_path_spaces = info.get("check_path_spaces", True)
 
     if not channel_urls and not channels_remap:
         sys.exit("Error: at least one entry in 'channels' or 'channels_remap' is required")
@@ -467,7 +477,7 @@ def main(info, verbose=True, dry_run=False, conda_exe="conda.exe"):
         has_conda, extra_envs_info) = _main(
             name, version, download_dir, platform, channel_urls, channels_remap, specs,
             exclude, menu_packages, ignore_duplicate_files, environment, environment_file,
-            verbose, dry_run, conda_exe, transmute_file_type, extra_envs
+            verbose, dry_run, conda_exe, transmute_file_type, extra_envs, check_path_spaces
         )
 
     info["_all_pkg_records"] = pkg_records  # full PackageRecord objects

constructor/header.sh

@@ -27,7 +27,7 @@ export INSTALLER_TYPE="SH"
 THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 THIS_FILE=$(basename "$0")
 THIS_PATH="$THIS_DIR/$THIS_FILE"
-PREFIX=__DEFAULT_PREFIX__
+PREFIX="__DEFAULT_PREFIX__"
 #if batch_mode
 BATCH=1
 #else
@@ -58,114 +58,60 @@ Installs __NAME__ __VERSION__
 #if not keep_pkgs
 -k           do not clear the package cache after installation
 #endif
+#if check_path_spaces
 -p PREFIX    install prefix, defaults to $PREFIX, must not contain spaces.
+#else
+-p PREFIX    install prefix, defaults to $PREFIX
+#endif
 -s           skip running pre/post-link/install scripts
 -u           update an existing installation
 #if has_conda
 -t           run package tests after installation (may install conda-build)
 #endif
 "
 
-if which getopt > /dev/null 2>&1; then
-    OPTS=$(getopt bifhkp:sut "$*" 2>/dev/null)
-    if [ ! $? ]; then
-        printf "%s\\n" "$USAGE"
-        exit 2
-    fi
-
-    eval set -- "$OPTS"
-
-    while true; do
-        case "$1" in
-            -h)
-                printf "%s\\n" "$USAGE"
-                exit 2
-                ;;
-            -b)
-                BATCH=1
-                shift
-                ;;
-            -i)
-                BATCH=0
-                shift
-                ;;
-            -f)
-                FORCE=1
-                shift
-                ;;
-            -k)
-                KEEP_PKGS=1
-                shift
-                ;;
-            -p)
-                PREFIX="$2"
-                shift
-                shift
-                ;;
-            -s)
-                SKIP_SCRIPTS=1
-                shift
-                ;;
-            -u)
-                FORCE=1
-                shift
-                ;;
-#if has_conda
-            -t)
-                TEST=1
-                shift
-                ;;
-#endif
-            --)
-                shift
-                break
-                ;;
-            *)
-                printf "ERROR: did not recognize option '%s', please try -h\\n" "$1"
-                exit 1
-                ;;
-        esac
-    done
-else
-    while getopts "bifhkp:sut" x; do
-        case "$x" in
-            h)
-                printf "%s\\n" "$USAGE"
-                exit 2
+# We used to have a getopt version here, falling back to getopts if needed
+# However getopt is not standardized and the version on Mac has different
+# behaviour. getopts is good enough for what we need :)
+# More info: https://unix.stackexchange.com/questions/62950/
+while getopts "bifhkp:sut" x; do
+    case "$x" in
+        h)
+            printf "%s\\n" "$USAGE"
+            exit 2
+        ;;
+        b)
+            BATCH=1
+            ;;
+        i)
+            BATCH=0
+            ;;
+        f)
+            FORCE=1
+            ;;
+        k)
+            KEEP_PKGS=1
+            ;;
+        p)
+            PREFIX="$OPTARG"
+            ;;
+        s)
+            SKIP_SCRIPTS=1
+            ;;
+        u)
+            FORCE=1
             ;;
-            b)
-                BATCH=1
-                ;;
-            i)
-                BATCH=0
-                ;;
-            f)
-                FORCE=1
-                ;;
-            k)
-                KEEP_PKGS=1
-                ;;
-            p)
-                PREFIX="$OPTARG"
-                ;;
-            s)
-                SKIP_SCRIPTS=1
-                ;;
-            u)
-                FORCE=1
-                ;;
 #if has_conda
-            t)
-                TEST=1
-                ;;
+        t)
+            TEST=1
+            ;;
 #endif
-            ?)
-                printf "ERROR: did not recognize option '%s', please try -h\\n" "$x"
-                exit 1
-                ;;
-        esac
-    done
-fi
+        ?)
+            printf "ERROR: did not recognize option '%s', please try -h\\n" "$x"
+            exit 1
+            ;;
+    esac
+done
 
 # For testing, keep the package cache around longer
 CLEAR_AFTER_TEST=0
@@ -343,6 +289,7 @@ EOF
     printf "[%s] >>> " "$PREFIX"
     read -r user_prefix
     if [ "$user_prefix" != "" ]; then
+#if check_path_spaces is True
         case "$user_prefix" in
             *\ * )
                 printf "ERROR: Cannot install into directories with spaces\\n" >&2
@@ -352,15 +299,20 @@ EOF
                 eval PREFIX="$user_prefix"
                 ;;
         esac
+#else
+        PREFIX="$user_prefix"
+#endif
     fi
 fi # !BATCH
 
+#if check_path_spaces is True
 case "$PREFIX" in
     *\ * )
         printf "ERROR: Cannot install into directories with spaces\\n" >&2
         exit 1
         ;;
 esac
+#endif
 
 if [ "$FORCE" = "0" ] && [ -e "$PREFIX" ]; then
     printf "ERROR: File or directory already exists: '%s'\\n" "$PREFIX" >&2
@@ -370,7 +322,6 @@ elif [ "$FORCE" = "1" ] && [ -e "$PREFIX" ]; then
     REINSTALL=1
 fi
 
-
 if ! mkdir -p "$PREFIX"; then
     printf "ERROR: Could not create directory: '%s'\\n" "$PREFIX" >&2
     exit 1
@@ -438,8 +389,8 @@ extract_range $boundary0 $boundary1 > "$CONDA_EXEC"
 chmod +x "$CONDA_EXEC"
 
 export TMP_BACKUP="$TMP"
-export TMP=$PREFIX/install_tmp
-mkdir -p $TMP
+export TMP="$PREFIX/install_tmp"
+mkdir -p "$TMP"
 
 # the second binary payload: the tarball of packages
 printf "Unpacking payload ...\n"
@@ -473,7 +424,6 @@ else
 fi
 #endif
 
-PYTHON="$PREFIX/bin/python"
 MSGS="$PREFIX/.messages.txt"
 touch "$MSGS"
 export FORCE
@@ -494,9 +444,9 @@ CONDA_PKGS_DIRS="$PREFIX/pkgs" \
 rm -f "$PREFIX/pkgs/env.txt"
 
 #if has_conda
-mkdir -p $PREFIX/envs
-for env_pkgs in ${PREFIX}/pkgs/envs/*/; do
-    env_name=$(basename ${env_pkgs})
+mkdir -p "$PREFIX/envs"
+for env_pkgs in "${PREFIX}"/pkgs/envs/*/; do
+    env_name=$(basename "${env_pkgs}")
     if [ "$env_name" = "*" ]; then
         continue
     fi
@@ -526,9 +476,9 @@ POSTCONDA="$PREFIX/postconda.tar.bz2"
 "$CONDA_EXEC" constructor --prefix "$PREFIX" --extract-tarball < "$POSTCONDA" || exit 1
 rm -f "$POSTCONDA"
 
-rm -f $PREFIX/conda.exe
+rm -f "$CONDA_EXEC"
 
-rm -rf $PREFIX/install_tmp
+rm -rf "$PREFIX/install_tmp"
 export TMP="$TMP_BACKUP"
 
 
@@ -560,7 +510,7 @@ if [ "$KEEP_PKGS" = "0" ]; then
 else
     # Attempt to delete the empty temporary directories in the package cache
     # These are artifacts of the constructor --extract-conda-pkgs
-    find $PREFIX/pkgs -type d -empty -exec rmdir {} \; 2>/dev/null || :
+    find "$PREFIX/pkgs" -type d -empty -exec rmdir {} \; 2>/dev/null || :
 fi
 
 cat <<EOF
@@ -609,13 +559,15 @@ if [ "$BATCH" = "0" ]; then
         printf "\\n"
     else
         case $SHELL in
-            *zsh) $PREFIX/bin/conda init zsh ;;
-            *) $PREFIX/bin/conda init ;;
+            # We call the module directly to avoid issues with spaces in shebang
+            *zsh) "$PREFIX/bin/python" -m conda init zsh ;;
+            *) "$PREFIX/bin/python" -m conda init ;;
         esac
         if [ -f "$PREFIX/bin/mamba" ]; then
             case $SHELL in
-                *zsh) $PREFIX/bin/mamba init zsh ;;
-                *) $PREFIX/bin/mamba init ;;
+                # We call the module directly to avoid issues with spaces in shebang
+                *zsh) "$PREFIX/bin/python" -m mamba.mamba init zsh ;;
+                *) "$PREFIX/bin/python" -m mamba.mamba init ;;
             esac
         fi
     fi