diff options
author | John W. Parent <45471568+johnwparent@users.noreply.github.com> | 2024-10-25 15:23:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-25 15:23:29 -0400 |
commit | 7b27aed4c85b3cf492ec8686cbcd30f302ea0d52 (patch) | |
tree | c7076e018918670f6dd16d233ad5804f8be3c995 /bin/spack_cmd.bat | |
parent | ad0b2564073ce91dfad2a49998c285525148a28a (diff) | |
download | spack-7b27aed4c85b3cf492ec8686cbcd30f302ea0d52.tar.gz spack-7b27aed4c85b3cf492ec8686cbcd30f302ea0d52.tar.bz2 spack-7b27aed4c85b3cf492ec8686cbcd30f302ea0d52.tar.xz spack-7b27aed4c85b3cf492ec8686cbcd30f302ea0d52.zip |
Normalize Spack Win entry points (#38648)
* Normalize Spack Win entrypoints
Currently Spack has multiple entrypoints on Windows that in addition to
differing from *nix implementations, differ from shell to shell on
Windows. This is a bit confusing for new users and in general
unnecessary.
This PR adds a normal setup script for the batch shell while preserving
the previous "click from file explorer for spack shell" behavior.
Additionally adds a shell title to both powershell and cmd letting users
know this is a Spack shell
* remove doskeys
Diffstat (limited to 'bin/spack_cmd.bat')
-rw-r--r-- | bin/spack_cmd.bat | 66 |
1 files changed, 3 insertions, 63 deletions
diff --git a/bin/spack_cmd.bat b/bin/spack_cmd.bat index 392e42d29b..da7b67e3bc 100644 --- a/bin/spack_cmd.bat +++ b/bin/spack_cmd.bat @@ -1,71 +1,11 @@ @ECHO OFF -setlocal EnableDelayedExpansion :: (c) 2021 Lawrence Livermore National Laboratory :: To use this file independently of Spack's installer, execute this script in its directory, or add the :: associated bin directory to your PATH. Invoke to launch Spack Shell. :: :: source_dir/spack/bin/spack_cmd.bat :: -pushd %~dp0.. -set SPACK_ROOT=%CD% -pushd %CD%\.. -set spackinstdir=%CD% -popd - -:: Check if Python is on the PATH -if not defined python_pf_ver ( -(for /f "delims=" %%F in ('where python.exe') do ( - set "python_pf_ver=%%F" - goto :found_python - ) ) 2> NUL -) -:found_python -if not defined python_pf_ver ( - :: If not, look for Python from the Spack installer - :get_builtin - (for /f "tokens=*" %%g in ('dir /b /a:d "!spackinstdir!\Python*"') do ( - set "python_ver=%%g")) 2> NUL - - if not defined python_ver ( - echo Python was not found on your system. - echo Please install Python or add Python to your PATH. - ) else ( - set "py_path=!spackinstdir!\!python_ver!" - set "py_exe=!py_path!\python.exe" - ) - goto :exitpoint -) else ( - :: Python is already on the path - set "py_exe=!python_pf_ver!" - (for /F "tokens=* USEBACKQ" %%F in ( - `"!py_exe!" --version`) do (set "output=%%F")) 2>NUL - if not "!output:Microsoft Store=!"=="!output!" goto :get_builtin - goto :exitpoint -) -:exitpoint - -set "PATH=%SPACK_ROOT%\bin\;%PATH%" -if defined py_path ( - set "PATH=%py_path%;%PATH%" -) - -if defined py_exe ( - "%py_exe%" "%SPACK_ROOT%\bin\haspywin.py" -) - -set "EDITOR=notepad" - -DOSKEY spacktivate=spack env activate $* - -@echo ********************************************************************** -@echo ** Spack Package Manager -@echo ********************************************************************** - -IF "%1"=="" GOTO CONTINUE -set -GOTO:EOF - -:continue -set PROMPT=[spack] %PROMPT% -%comspec% /k +call "%~dp0..\share\spack\setup-env.bat" +pushd %SPACK_ROOT% +%comspec% /K |