Skip to content

Commit

Permalink
Do not launch Spyder if installing in CI or batch/silent mode.
Browse files Browse the repository at this point in the history
With conda/constructor#885, batch/silent mode installs will automatically set INSTALLER_UNATTENDED environment variable accessible by user scripts. Until the next constructor version (>3.9.3) users may set either CI=1 or INSTALLER_UNATTENDED=1 at the commandline.
  • Loading branch information
mrclary committed Nov 6, 2024
1 parent acfee6e commit 0370432
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
14 changes: 11 additions & 3 deletions installers-conda/resources/post-install.bat
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
rem This script launches Spyder after install
@rem This script launches Spyder after install
@echo off

if "%CI%"=="1" set no_launch_spyder=true
if "%INSTALLER_UNATTENDED%"=="1" set no_launch_spyder=true
if defined no_launch_spyder (
@echo Installing in CI or silent mode, do not launch Spyder
exit /b %errorlevel%
)

set mode=system
if exist "%PREFIX%\.nonadmin" set mode=user

rem Get shortcut path
@rem Get shortcut path
for /F "tokens=*" %%i in (
'%PREFIX%\python %PREFIX%\Scripts\menuinst_cli.py shortcut --mode=%mode%'
) do (
set shortcut=%%~fi
)

rem Launch Spyder
@rem Launch Spyder
set tmpdir=%TMP%\spyder
set launch_script=%tmpdir%\launch_script.bat

Expand All @@ -21,6 +28,7 @@ echo @echo off
echo :loop
echo tasklist /fi "ImageName eq Spyder-*" /fo csv 2^>NUL ^| findstr /r "Spyder-.*Windows-x86_64.exe"^>NUL
echo if "%%errorlevel%%"=="0" ^(
echo @rem Installer is still running
echo timeout /t 1 /nobreak ^> nul
echo goto loop
echo ^) else ^(
Expand Down
5 changes: 4 additions & 1 deletion installers-conda/resources/post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,10 @@ fi
echo "*** Post install script for ${INSTALLER_NAME} complete"

# ---- Launch Spyder
[[ -n "$CI" ]] && exit 0 # Running in CI, don't launch Spyder
if [[ -n "$CI" || "$INSTALLER_UNATTENDED" == "1" ]]; then
echo Installing in CI or batch mode, do not launch Spyder
exit 0
fi

echo "Launching Spyder now..."
if [[ "$OSTYPE" == "darwin"* ]]; then
Expand Down
2 changes: 1 addition & 1 deletion installers-conda/resources/pre-install.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rem Mark as conda-based-app
@rem Mark as conda-based-app
set menudir=%PREFIX%\envs\spyder-runtime\Menu
if not exist "%menudir%" mkdir "%menudir%"
echo. > "%menudir%\conda-based-app"

0 comments on commit 0370432

Please sign in to comment.