diff options
| author | John Parent <john.parent@kitware.com> | 2022-01-25 17:29:17 -0500 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2022-03-17 09:01:01 -0700 |
| commit | 90c773488c59e57c19ecca5635c1ae7f70e56076 (patch) | |
| tree | 92afff7ea0751cb9b3a41bd33ded560b5c00fe82 /bin | |
| parent | e65d3d14b4a7a9a9667b006bea1f9f2eafc69472 (diff) | |
| download | spack-90c773488c59e57c19ecca5635c1ae7f70e56076.tar.gz spack-90c773488c59e57c19ecca5635c1ae7f70e56076.tar.bz2 spack-90c773488c59e57c19ecca5635c1ae7f70e56076.tar.xz spack-90c773488c59e57c19ecca5635c1ae7f70e56076.zip | |
Add Github Actions for Windows (#24504)
Setup Installer CI (#25184), (#25191)
Co-authored-by: Zack Galbreath <zack.galbreath@kitware.com>
Co-authored-by: lou.lawrence@kitware.com <lou.lawrence@kitware.com>
Co-authored-by: Betsy McPhail <betsy.mcphail@kitware.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/spack.bat | 4 | ||||
| -rw-r--r-- | bin/spack_cmd.bat | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/bin/spack.bat b/bin/spack.bat index 3b6b7905a4..4781c42702 100644 --- a/bin/spack.bat +++ b/bin/spack.bat @@ -187,7 +187,7 @@ python "%spack%" %_sp_flags% %_sp_subcommand% %_sp_args% goto :end_switch :end_switch -exit /B 0 +exit /B %ERRORLEVEL% ::######################################################################## @@ -220,4 +220,4 @@ for %%I in (%~2) do ( :pathadd "%~1" "%%I\%%Z" ) ) -exit /B 0
\ No newline at end of file +exit /B %ERRORLEVEL%
\ No newline at end of file diff --git a/bin/spack_cmd.bat b/bin/spack_cmd.bat index 6d851d5311..5ba685fa46 100644 --- a/bin/spack_cmd.bat +++ b/bin/spack_cmd.bat @@ -14,8 +14,9 @@ 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) ) 2> NUL - +) if not defined python_pf_ver ( :: If not, look for Python from the Spack installer :get_builtin @@ -58,4 +59,9 @@ DOSKEY spacktivate=spack env activate $* @echo ** Spack Package Manager @echo ********************************************************************** +IF "%1"=="" GOTO CONTINUE +set +GOTO:EOF + +:continue %comspec% /k |