Skip to content

Commit 7d2e725

Browse files
committed
Update NSIS installer patch.
1 parent e0940df commit 7d2e725

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

static/0001-Customize-Windows-NSIS-installer-script.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Subject: [PATCH] Customize Windows NSIS installer script.
1111
1 file changed, 31 insertions(+), 2 deletions(-)
1212

1313
diff --git a/constructor/nsis/main.nsi.tmpl b/constructor/nsis/main.nsi.tmpl
14-
index 6f5c8ae..df85d27 100644
14+
index 865ebb3..2e84269 100644
1515
--- a/constructor/nsis/main.nsi.tmpl
1616
+++ b/constructor/nsis/main.nsi.tmpl
17-
@@ -151,7 +151,7 @@ Page Custom InstModePage_Create InstModePage_Leave
17+
@@ -153,7 +153,7 @@ Page Custom InstModePage_Create InstModePage_Leave
1818
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirectoryLeave
1919
!insertmacro MUI_PAGE_DIRECTORY
2020
# Custom options now differ depending on installation mode.
@@ -23,7 +23,7 @@ index 6f5c8ae..df85d27 100644
2323
!insertmacro MUI_PAGE_INSTFILES
2424
#if with_conclusion_text is True
2525
!define MUI_FINISHPAGE_TITLE __CONCLUSION_TITLE__
26-
@@ -1087,7 +1087,7 @@ Section "Install"
26+
@@ -1185,7 +1185,7 @@ Section "Install"
2727

2828
${If} $Ana_ClearPkgCache_State = ${BST_CHECKED}
2929
DetailPrint "Clearing package cache..."
@@ -32,7 +32,7 @@ index 6f5c8ae..df85d27 100644
3232
push 'Failed to clear package cache'
3333
push 'WithLog'
3434
call AbortRetryNSExecWait
35-
@@ -1120,6 +1120,26 @@ Section "Install"
35+
@@ -1218,6 +1218,26 @@ Section "Install"
3636
${EndIf}
3737

3838
${If} $ARGV_NoRegistry == "0"
@@ -59,7 +59,7 @@ index 6f5c8ae..df85d27 100644
5959
# Registry uninstall info
6060
WriteRegStr SHCTX "${UNINSTREG}" "DisplayName" "${UNINSTALL_NAME}"
6161
WriteRegStr SHCTX "${UNINSTREG}" "DisplayVersion" "${VERSION}"
62-
@@ -1202,6 +1222,15 @@ Section "Uninstall"
62+
@@ -1326,6 +1346,15 @@ Section "Uninstall"
6363
# In case the last command fails, run the slow method to remove leftover
6464
RMDir /r /REBOOTOK "$INSTDIR"
6565

@@ -72,9 +72,9 @@ index 6f5c8ae..df85d27 100644
7272
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
7373
+ ${EndIf}
7474
+
75-
DeleteRegKey SHCTX "${UNINSTREG}"
76-
# If Anaconda was registered as the official Python for this version,
77-
# remove it from the registry
75+
${If} $INSTALLER_NAME_FULL != ""
76+
DeleteRegKey SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTALLER_NAME_FULL"
77+
${EndIf}
7878
--
79-
2.39.2
79+
2.40.0
8080

0 commit comments

Comments
 (0)