Remove allowAppDataPluginsLoading option from the installer
This commit is contained in:
parent
e9a489c5c9
commit
113212547f
|
@ -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 /SOLID lzma ; This reduces installer size by approx 30~35%
|
||||||
;SetCompressor /FINAL lzma ; This reduces installer size by approx 15~18%
|
;SetCompressor /FINAL lzma ; This reduces installer size by approx 15~18%
|
||||||
|
|
||||||
Var allowAppDataPluginsLoading
|
|
||||||
|
|
||||||
!include "nsisInclude\winVer.nsh"
|
!include "nsisInclude\winVer.nsh"
|
||||||
!include "nsisInclude\globalDef.nsh"
|
!include "nsisInclude\globalDef.nsh"
|
||||||
!include "nsisInclude\tools.nsh"
|
!include "nsisInclude\tools.nsh"
|
||||||
|
@ -113,15 +111,6 @@ Var noUpdater
|
||||||
Function .onInit
|
Function .onInit
|
||||||
|
|
||||||
${GetParameters} $R0
|
${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
|
${GetOptions} $R0 "/noUpdater" $R1 ;case insensitive
|
||||||
IfErrors withUpdater withoutUpdater
|
IfErrors withUpdater withoutUpdater
|
||||||
withUpdater:
|
withUpdater:
|
||||||
|
|
|
@ -49,14 +49,6 @@ initUpdatePath:
|
||||||
StrCpy $UPDATE_PATH "$APPDATA\${APPNAME}"
|
StrCpy $UPDATE_PATH "$APPDATA\${APPNAME}"
|
||||||
CreateDirectory $UPDATE_PATH\plugins\config
|
CreateDirectory $UPDATE_PATH\plugins\config
|
||||||
${EndIf}
|
${EndIf}
|
||||||
|
|
||||||
${If} $allowAppDataPluginsLoading == "true"
|
|
||||||
File "..\bin\allowAppDataPlugins.xml"
|
|
||||||
${ELSE}
|
|
||||||
IfFileExists $INSTDIR\allowAppDataPlugins.xml 0 +2
|
|
||||||
Delete $INSTDIR\allowAppDataPlugins.xml
|
|
||||||
${EndIf}
|
|
||||||
|
|
||||||
alreadyDone:
|
alreadyDone:
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
|
@ -93,23 +93,16 @@ Function ExtraOptions
|
||||||
Abort
|
Abort
|
||||||
${EndIf}
|
${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."
|
${NSD_CreateCheckbox} 0 0 100% 30u "Create Shortcut on Desktop"
|
||||||
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"
|
|
||||||
Pop $ShortcutCheckboxHandle
|
Pop $ShortcutCheckboxHandle
|
||||||
StrCmp $WinVer "8" 0 +2
|
StrCmp $WinVer "8" 0 +2
|
||||||
${NSD_Check} $ShortcutCheckboxHandle
|
${NSD_Check} $ShortcutCheckboxHandle
|
||||||
${NSD_OnClick} $ShortcutCheckboxHandle OnChange_ShortcutCheckBox
|
${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
|
nsDialogs::Show
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
@ -139,16 +132,6 @@ Function OnChange_NoUserDataCheckBox
|
||||||
${NSD_GetState} $NoUserDataCheckboxHandle $noUserDataChecked
|
${NSD_GetState} $NoUserDataCheckboxHandle $noUserDataChecked
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
Function OnChange_PluginLoadFromUserDataCheckBox
|
|
||||||
${NSD_GetState} $PluginLoadFromUserDataCheckboxHandle $allowPluginLoadFromUserDataChecked
|
|
||||||
|
|
||||||
${If} $allowPluginLoadFromUserDataChecked == ${BST_CHECKED}
|
|
||||||
StrCpy $allowAppDataPluginsLoading "true"
|
|
||||||
${ELSE}
|
|
||||||
StrCpy $allowAppDataPluginsLoading "false"
|
|
||||||
${EndIf}
|
|
||||||
FunctionEnd
|
|
||||||
|
|
||||||
Function OnChange_ShortcutCheckBox
|
Function OnChange_ShortcutCheckBox
|
||||||
${NSD_GetState} $ShortcutCheckboxHandle $createShortcutChecked
|
${NSD_GetState} $ShortcutCheckboxHandle $createShortcutChecked
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
Loading…
Reference in New Issue