Make %PROGRAMDATA%\Notepad++\plugins\ as default plugins installation location

And remove %LOCALAPPDATA%\Notepad++\plugins\ location
This commit is contained in:
Don HO 2018-12-02 00:58:07 +01:00
parent c919dc6270
commit f8aba0122e
4 changed files with 6 additions and 41 deletions

View File

@ -41,8 +41,6 @@ SetCompressor /SOLID lzma ; This reduces installer size by approx 30~35%
; Installer is DPI-aware: not scaled by the DWM, no blurry text ; Installer is DPI-aware: not scaled by the DWM, no blurry text
ManifestDPIAware true ManifestDPIAware true
Var arePlugins4AllUsers
!include "nsisInclude\winVer.nsh" !include "nsisInclude\winVer.nsh"
!include "nsisInclude\globalDef.nsh" !include "nsisInclude\globalDef.nsh"
!include "nsisInclude\tools.nsh" !include "nsisInclude\tools.nsh"
@ -133,16 +131,6 @@ withoutUpdater:
StrCpy $noUpdater "true" StrCpy $noUpdater "true"
updaterDone: updaterDone:
${GetOptions} $R0 "/pluginsForAllUsers" $R1 ;case insensitive
IfErrors withoutPlugins4AllUsers withPlugins4AllUsers
withPlugins4AllUsers:
StrCpy $arePlugins4AllUsers "true"
Goto plugins4AllUsersDone
withoutPlugins4AllUsers:
StrCpy $arePlugins4AllUsers "false"
plugins4AllUsersDone:
${If} $noUpdater == "true" ${If} $noUpdater == "true"
!insertmacro UnSelectSection ${AutoUpdater} !insertmacro UnSelectSection ${AutoUpdater}
SectionSetText ${AutoUpdater} "" SectionSetText ${AutoUpdater} ""

View File

@ -283,7 +283,6 @@ SectionGroup "Localization" localization
${MementoUnselectedSection} "Kurdish" kurdish ${MementoUnselectedSection} "Kurdish" kurdish
CopyFiles "$PLUGINSDIR\nppLocalization\kurdish.xml" "$INSTDIR\localization\kurdish.xml" CopyFiles "$PLUGINSDIR\nppLocalization\kurdish.xml" "$INSTDIR\localization\kurdish.xml"
${MementoSectionEnd} ${MementoSectionEnd}
${MementoSectionEnd}
${MementoUnselectedSection} "Piglatin" piglatin ${MementoUnselectedSection} "Piglatin" piglatin
CopyFiles "$PLUGINSDIR\nppLocalization\piglatin.xml" "$INSTDIR\localization\piglatin.xml" CopyFiles "$PLUGINSDIR\nppLocalization\piglatin.xml" "$INSTDIR\localization\piglatin.xml"
${MementoSectionEnd} ${MementoSectionEnd}

View File

@ -51,21 +51,16 @@ initUpdatePath:
${ELSE} ${ELSE}
IfFileExists $INSTDIR\doLocalConf.xml 0 +2 IfFileExists $INSTDIR\doLocalConf.xml 0 +2
Delete $INSTDIR\doLocalConf.xml Delete $INSTDIR\doLocalConf.xml
StrCpy $PLUGIN_INST_PATH "$PROFILE\AppData\Local\${APPNAME}\plugins"
; "%PROGRAMDATA%\Notepad++\plugins"
ReadEnvStr $0 "ALLUSERSPROFILE"
StrCpy $PLUGIN_INST_PATH "$0\Notepad++\plugins"
StrCpy $PLUGIN_CONF_PATH "$APPDATA\${APPNAME}\plugins\Config" StrCpy $PLUGIN_CONF_PATH "$APPDATA\${APPNAME}\plugins\Config"
StrCpy $UPDATE_PATH "$APPDATA\${APPNAME}" StrCpy $UPDATE_PATH "$APPDATA\${APPNAME}"
CreateDirectory $UPDATE_PATH\plugins\config CreateDirectory $UPDATE_PATH\plugins\config
${EndIf} ${EndIf}
; override PLUGIN_INST_PATH
${If} $arePlugins4AllUsers == "true"
ReadEnvStr $0 "ALLUSERSPROFILE"
StrCpy $PLUGIN_INST_PATH "$0\Notepad++\plugins"
File /oname=$INSTDIR\pluginsForAllUsers.xml "..\bin\pluginsForAllUsers_dummy.xml"
${ELSE}
Delete $INSTDIR\pluginsForAllUsers.xml
${EndIf}
alreadyDone: alreadyDone:
FunctionEnd FunctionEnd

View File

@ -81,7 +81,6 @@ FunctionEnd
;Installer Functions ;Installer Functions
Var Dialog Var Dialog
Var NoUserDataCheckboxHandle Var NoUserDataCheckboxHandle
Var Plugin4AllUsersCheckboxHandle
Var ShortcutCheckboxHandle Var ShortcutCheckboxHandle
Var WinVer Var WinVer
@ -99,14 +98,7 @@ Function ExtraOptions
${NSD_Check} $ShortcutCheckboxHandle ${NSD_Check} $ShortcutCheckboxHandle
${NSD_OnClick} $ShortcutCheckboxHandle OnChange_ShortcutCheckBox ${NSD_OnClick} $ShortcutCheckboxHandle OnChange_ShortcutCheckBox
${NSD_CreateCheckbox} 0 80 100% 30u "Check this will make your plugin installed for all users on this PC." ${NSD_CreateCheckbox} 0 80 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 $Plugin4AllUsersCheckboxHandle
${If} $arePlugins4AllUsers == "true"
${NSD_Check} $Plugin4AllUsersCheckboxHandle
${EndIf}
${NSD_OnClick} $Plugin4AllUsersCheckboxHandle OnChange_Plugin4AllUsersCheckBox
${NSD_CreateCheckbox} 0 160 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 Pop $NoUserDataCheckboxHandle
${NSD_OnClick} $NoUserDataCheckboxHandle OnChange_NoUserDataCheckBox ${NSD_OnClick} $NoUserDataCheckboxHandle OnChange_NoUserDataCheckBox
@ -142,15 +134,6 @@ Function OnChange_ShortcutCheckBox
${NSD_GetState} $ShortcutCheckboxHandle $createShortcutChecked ${NSD_GetState} $ShortcutCheckboxHandle $createShortcutChecked
FunctionEnd FunctionEnd
Function OnChange_Plugin4AllUsersCheckBox
${NSD_GetState} $ShortcutCheckboxHandle $0
${If} $0 == ${BST_CHECKED}
StrCpy $arePlugins4AllUsers "true"
${ELSE}
StrCpy $arePlugins4AllUsers "false"
${EndIf}
FunctionEnd
Function writeInstallInfoInRegistry Function writeInstallInfoInRegistry
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe" "" "$INSTDIR\notepad++.exe" WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe" "" "$INSTDIR\notepad++.exe"