shway/radioconda
1
0
Fork 0
mirror of https://github.com/ryanvolz/radioconda.git synced 2025-08-04 06:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update NSIS patch to not show advanced options, debug registry mods.

Browse Source
This commit is contained in:
Ryan Volz 2022-02-25 13:00:19 -05:00
parent d4224406b8
commit 4bffe98c97
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,14 +5,24 @@ Subject: [PATCH] Customize Windows NSIS installer script.
1. Never clear the full pkg dir 1. Never clear the full pkg dir
2. Delete environment variables set in registry by PothosSDR 2. Delete environment variables set in registry by PothosSDR
3. Do not show "advanced" installation options
--- ---
constructor/nsis/main.nsi.tmpl | 9 ++++++++- constructor/nsis/main.nsi.tmpl | 11 +++++++++--
1 file changed, 8 insertions(+), 1 deletion(-) 1 file changed, 9 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..9ea05cf 100644 index 2426248..a7b6f1d 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
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirectoryLeave
!insertmacro MUI_PAGE_DIRECTORY
# Custom options now differ depending on installation mode.
-Page Custom mui_AnaCustomOptions_Show
+#Page Custom mui_AnaCustomOptions_Show
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
@@ -933,7 +933,7 @@ Section "Install" @@ -933,7 +933,7 @@ Section "Install"
${If} $Ana_ClearPkgCache_State = ${BST_CHECKED} ${If} $Ana_ClearPkgCache_State = ${BST_CHECKED}
@ -27,11 +37,11 @@ index 2426248..9ea05cf 100644
${If} $ARGV_NoRegistry == "0" ${If} $ARGV_NoRegistry == "0"
+ # Delete registry entries for environment variables set by PothosSDR + # Delete registry entries for environment variables set by PothosSDR
+ DeleteRegValue HKEY_LOCAL_MACHINE "System\CurrentControlSet\Control\Session Manager\Environment" "GR_PREFIX" + DeleteRegValue HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "GR_PREFIX"
+ DeleteRegValue HKEY_LOCAL_MACHINE "System\CurrentControlSet\Control\Session Manager\Environment" "GRC_BLOCKS_PATH" + DeleteRegValue HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "GRC_BLOCKS_PATH"
+ DeleteRegValue HKEY_LOCAL_MACHINE "System\CurrentControlSet\Control\Session Manager\Environment" "UHD_PKG_PATH" + DeleteRegValue HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "UHD_PKG_PATH"
+ DeleteRegValue HKEY_LOCAL_MACHINE "System\CurrentControlSet\Control\Session Manager\Environment" "VOLK_PREFIX" + DeleteRegValue HKEY_LOCAL_MACHINE "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "VOLK_PREFIX"
+ ClearErrors + #ClearErrors
+ +
# Registry uninstall info # Registry uninstall info
WriteRegStr SHCTX "${UNINSTREG}" "DisplayName" "${UNINSTALL_NAME}" WriteRegStr SHCTX "${UNINSTREG}" "DisplayName" "${UNINSTALL_NAME}"