tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove allowAppDataPluginsLoading option from the installer

This commit is contained in:
Don HO 2018-11-03 20:57:10 +01:00
parent e9a489c5c9
commit 113212547f
4 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
PowerEditor/bin/allowAppDataPlugins.xml
View File

11
PowerEditor/installer/nppSetup.nsi
View File

@ -37,8 +37,6 @@ Unicode true ; Generate a Unicode installer. It can only be used outside of se
SetCompressor /SOLID lzma ; This reduces installer size by approx 30~35%
;SetCompressor /FINAL lzma ; This reduces installer size by approx 15~18%
Var allowAppDataPluginsLoading
!include "nsisInclude\winVer.nsh"
!include "nsisInclude\globalDef.nsh"
!include "nsisInclude\tools.nsh"
@ -113,15 +111,6 @@ Var noUpdater
Function .onInit
${GetParameters} $R0
${GetOptions} $R0 "/allowAppDataPluginsLoading" $R1 ;case insensitive
IfErrors appdataLoadNo appdataLoadYes
appdataLoadNo:
StrCpy $allowAppDataPluginsLoading "false"
Goto appdataLoadDone
appdataLoadYes:
StrCpy $allowAppDataPluginsLoading "true"
appdataLoadDone:
${GetOptions} $R0 "/noUpdater" $R1 ;case insensitive
IfErrors withUpdater withoutUpdater
withUpdater:

8
PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
View File

@ -49,14 +49,6 @@ initUpdatePath:
StrCpy $UPDATE_PATH "$APPDATA\${APPNAME}"
CreateDirectory $UPDATE_PATH\plugins\config
${EndIf}
${If} $allowAppDataPluginsLoading == "true"
File "..\bin\allowAppDataPlugins.xml"
${ELSE}
IfFileExists $INSTDIR\allowAppDataPlugins.xml 0 +2
Delete $INSTDIR\allowAppDataPlugins.xml
${EndIf}
alreadyDone:
FunctionEnd

27
PowerEditor/installer/nsisInclude/tools.nsh
View File

@ -93,23 +93,16 @@ Function ExtraOptions
Abort
${EndIf}
${NSD_CreateCheckbox} 0 0 100% 30u "Don't use %APPDATA%$\nEnable this option to make Notepad++ load/write the configuration files from/to its install directory. Check it if you use Notepad++ in a USB device."
Pop $NoUserDataCheckboxHandle
${NSD_OnClick} $NoUserDataCheckboxHandle OnChange_NoUserDataCheckBox
${NSD_CreateCheckbox} 0 50 100% 30u "Allow plugins to be loaded from %APPDATA%\notepad++\plugins$\nIt could cause a security issue. Turn it on if you know what you are doing."
Pop $PluginLoadFromUserDataCheckboxHandle
${NSD_OnClick} $PluginLoadFromUserDataCheckboxHandle OnChange_PluginLoadFromUserDataCheckBox
${If} $allowAppDataPluginsLoading == "true"
${NSD_Check} $PluginLoadFromUserDataCheckboxHandle
${EndIf}
${NSD_CreateCheckbox} 0 110 100% 30u "Create Shortcut on Desktop"
${NSD_CreateCheckbox} 0 0 100% 30u "Create Shortcut on Desktop"
Pop $ShortcutCheckboxHandle
StrCmp $WinVer "8" 0 +2
${NSD_Check} $ShortcutCheckboxHandle
${NSD_OnClick} $ShortcutCheckboxHandle OnChange_ShortcutCheckBox
${NSD_CreateCheckbox} 0 50 100% 30u "Don't use %APPDATA%$\nEnable this option to make Notepad++ load/write the configuration files from/to its install directory. Check it if you use Notepad++ in a USB device."
Pop $NoUserDataCheckboxHandle
${NSD_OnClick} $NoUserDataCheckboxHandle OnChange_NoUserDataCheckBox
nsDialogs::Show
FunctionEnd
@ -139,16 +132,6 @@ Function OnChange_NoUserDataCheckBox
${NSD_GetState} $NoUserDataCheckboxHandle $noUserDataChecked
FunctionEnd
Function OnChange_PluginLoadFromUserDataCheckBox
${NSD_GetState} $PluginLoadFromUserDataCheckboxHandle $allowPluginLoadFromUserDataChecked
${If} $allowPluginLoadFromUserDataChecked == ${BST_CHECKED}
StrCpy $allowAppDataPluginsLoading "true"
${ELSE}
StrCpy $allowAppDataPluginsLoading "false"
${EndIf}
FunctionEnd
Function OnChange_ShortcutCheckBox
${NSD_GetState} $ShortcutCheckboxHandle $createShortcutChecked
FunctionEnd