From 747fbaf97ca18d60b1b4a2d772aee60704abdd5b Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 6 Apr 2026 15:07:59 -0400 Subject: [PATCH 1/2] Set CONDA_QUIET --- constructor/briefcase/pre_uninstall.bat | 2 ++ constructor/briefcase/run_installation.bat | 2 ++ 2 files changed, 4 insertions(+) diff --git a/constructor/briefcase/pre_uninstall.bat b/constructor/briefcase/pre_uninstall.bat index 9f2dd9094..35190f56b 100644 --- a/constructor/briefcase/pre_uninstall.bat +++ b/constructor/briefcase/pre_uninstall.bat @@ -25,6 +25,8 @@ set "PREFIX=%BASE_PATH%" set "CONDA_EXE=%INSTDIR%\{{ conda_exe_name }}" set "PAYLOAD_TAR=%INSTDIR%\{{ archive_name }}" set "CONDA_ROOT_PREFIX=%BASE_PATH%" +rem Set CONDA_QUIET primarily to disable the spinners +set CONDA_QUIET={{ 0 if add_debug else 1 }} rem Get the name of the install directory for %%I in ("%INSTDIR%") do set "APPNAME=%%~nxI" diff --git a/constructor/briefcase/run_installation.bat b/constructor/briefcase/run_installation.bat index aabf9ecc9..1abdc7066 100644 --- a/constructor/briefcase/run_installation.bat +++ b/constructor/briefcase/run_installation.bat @@ -41,6 +41,8 @@ set CONDA_PROTECT_FROZEN_ENVS=0 set CONDA_REGISTER_ENVS={{ register_envs }} set CONDA_SAFETY_CHECKS=disabled set "CONDA_ROOT_PREFIX=%BASE_PATH%" +rem Set CONDA_QUIET primarily to disable the spinners +set CONDA_QUIET={{ 0 if add_debug else 1 }} rem Get the name of the install directory for %%I in ("%INSTDIR%") do set "APPNAME=%%~nxI" From 3631f4305f01759e1546225b755175173686620d Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 7 Apr 2026 11:10:07 -0400 Subject: [PATCH 2/2] Add new uninstaller variables --- constructor/briefcase/pre_uninstall.bat | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/constructor/briefcase/pre_uninstall.bat b/constructor/briefcase/pre_uninstall.bat index 35190f56b..47b31713f 100644 --- a/constructor/briefcase/pre_uninstall.bat +++ b/constructor/briefcase/pre_uninstall.bat @@ -55,6 +55,13 @@ if exist "%BASE_PATH%\.nonadmin" ( set "REG_HIVE=HKLM" ) +rem Map OPTION_* to UNINSTALLER_* for compatibility with NSIS uninstaller scripts +if "%OPTION_REMOVE_USER_DATA%"=="1" set "UNINSTALLER_REMOVE_USER_DATA=1" +if "%OPTION_REMOVE_CACHES%"=="1" set "UNINSTALLER_REMOVE_CACHES=1" +if "%OPTION_REMOVE_CONFIG_FILES%"=="1" ( + if "%REG_HIVE%"=="HKCU" (set "UNINSTALLER_REMOVE_CONFIG_FILES=user") else (set "UNINSTALLER_REMOVE_CONFIG_FILES=all") +) + {%- if add_debug %} >> "%LOG%" echo ==== pre_uninstall start ==== >> "%LOG%" echo SCRIPT=%~f0 @@ -69,6 +76,9 @@ if exist "%BASE_PATH%\.nonadmin" ( >> "%LOG%" echo OPTION_REMOVE_USER_DATA=%OPTION_REMOVE_USER_DATA% >> "%LOG%" echo OPTION_REMOVE_CACHES=%OPTION_REMOVE_CACHES% >> "%LOG%" echo OPTION_REMOVE_CONFIG_FILES=%OPTION_REMOVE_CONFIG_FILES% +>> "%LOG%" echo UNINSTALLER_REMOVE_USER_DATA=%UNINSTALLER_REMOVE_USER_DATA% +>> "%LOG%" echo UNINSTALLER_REMOVE_CACHES=%UNINSTALLER_REMOVE_CACHES% +>> "%LOG%" echo UNINSTALLER_REMOVE_CONFIG_FILES=%UNINSTALLER_REMOVE_CONFIG_FILES% "%CONDA_EXE%" --version >> "%LOG%" 2>&1 {%- endif %}