shway/radioconda
1
0
Fork 0
mirror of https://github.com/ryanvolz/radioconda.git synced 2024-11-30 16:19:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update NSIS patch, maybe fix NSIS build issue?

Browse Source
This commit is contained in:
Ryan Volz 2023-02-24 18:41:00 -05:00
parent ff3b7b99a8
commit 0b017ff62c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
static/0001-Customize-Windows-NSIS-installer-script.patch
View File

@ -11,28 +11,28 @@ Subject: [PATCH] Customize Windows NSIS installer script.
1 file changed, 31 insertions(+), 2 deletions(-) 1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/constructor/nsis/main.nsi.tmpl b/constructor/nsis/main.nsi.tmpl diff --git a/constructor/nsis/main.nsi.tmpl b/constructor/nsis/main.nsi.tmpl
index 2426248..95c94c2 100644 index 6f5c8ae..df85d27 100644
--- a/constructor/nsis/main.nsi.tmpl --- a/constructor/nsis/main.nsi.tmpl
+++ b/constructor/nsis/main.nsi.tmpl +++ b/constructor/nsis/main.nsi.tmpl
@@ -118,7 +118,7 @@ Page Custom InstModePage_Create InstModePage_Leave @@ -151,7 +151,7 @@ Page Custom InstModePage_Create InstModePage_Leave
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirectoryLeave !define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirectoryLeave
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
# Custom options now differ depending on installation mode. # Custom options now differ depending on installation mode.
-Page Custom mui_AnaCustomOptions_Show -Page Custom mui_AnaCustomOptions_Show
+#Page Custom mui_AnaCustomOptions_Show +#Page Custom mui_AnaCustomOptions_Show
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH #if with_conclusion_text is True
!define MUI_FINISHPAGE_TITLE __CONCLUSION_TITLE__
@@ -933,7 +933,7 @@ Section "Install" @@ -1087,7 +1087,7 @@ Section "Install"
${If} $Ana_ClearPkgCache_State = ${BST_CHECKED} ${If} $Ana_ClearPkgCache_State = ${BST_CHECKED}
DetailPrint "Clearing package cache..." DetailPrint "Clearing package cache..."
- push '"$INSTDIR\_conda.exe" clean --all --force-pkgs-dirs --yes' - push '"$INSTDIR\_conda.exe" clean --all --force-pkgs-dirs --yes'
+ push '"$INSTDIR\_conda.exe" clean --all --yes' + push '"$INSTDIR\_conda.exe" clean --all --yes'
push 'Failed to clear package cache' push 'Failed to clear package cache'
push 'WithLog'
call AbortRetryNSExecWait call AbortRetryNSExecWait
${EndIf} @@ -1120,6 +1120,26 @@ Section "Install"
@@ -964,6 +964,26 @@ Section "Install"
${EndIf} ${EndIf}
${If} $ARGV_NoRegistry == "0" ${If} $ARGV_NoRegistry == "0"
@ -59,7 +59,7 @@ index 2426248..95c94c2 100644
# Registry uninstall info # Registry uninstall info
WriteRegStr SHCTX "${UNINSTREG}" "DisplayName" "${UNINSTALL_NAME}" WriteRegStr SHCTX "${UNINSTREG}" "DisplayName" "${UNINSTALL_NAME}"
WriteRegStr SHCTX "${UNINSTREG}" "DisplayVersion" "${VERSION}" WriteRegStr SHCTX "${UNINSTREG}" "DisplayVersion" "${VERSION}"
@@ -1014,6 +1034,15 @@ Section "Uninstall" @@ -1202,6 +1222,15 @@ Section "Uninstall"
# In case the last command fails, run the slow method to remove leftover # In case the last command fails, run the slow method to remove leftover
RMDir /r /REBOOTOK "$INSTDIR" RMDir /r /REBOOTOK "$INSTDIR"
@ -76,5 +76,5 @@ index 2426248..95c94c2 100644
# If Anaconda was registered as the official Python for this version, # If Anaconda was registered as the official Python for this version,
# remove it from the registry # remove it from the registry
-- --
2.35.0 2.39.2