From e9b021839aeb995fc3b752cf8b1bb1ddca933440 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Mon, 8 Aug 2022 21:06:00 +0200 Subject: [PATCH] Sync 32bit nsi --- dist/SysTray-X-32bit.nsi | 23 ++++++++++++++++++----- dist/policies.json | 10 ---------- 2 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 dist/policies.json diff --git a/dist/SysTray-X-32bit.nsi b/dist/SysTray-X-32bit.nsi index 724e907..ca56173 100644 --- a/dist/SysTray-X-32bit.nsi +++ b/dist/SysTray-X-32bit.nsi @@ -70,7 +70,7 @@ Section "Install" WriteUninstaller "$INSTDIR\Uninstall.exe" WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\systray-x@Ximi1970" "DisplayName" "$(^Name)" - WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\systray-x@Ximi1970" "DisplayVersion" "$\"${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}$\"" + WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\systray-x@Ximi1970" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}" WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "VersionMajor" ${VERSIONMAJOR} WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "VersionMinor" ${VERSIONMINOR} WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\systray-x@Ximi1970" "UninstallString" "$INSTDIR\Uninstall.exe" @@ -118,12 +118,25 @@ Section "Install" SetOutPath "$PROGRAMFILES\Mozilla Thunderbird\distribution\extensions" File "..\systray-x@Ximi1970.xpi" - SetOutPath "$PROGRAMFILES\Mozilla Thunderbird\distribution" - ${If} ${FileExists} `$PROGRAMFILES\Mozilla Thunderbird\distribution\policies.json` - File "policies.json" + nsJSON::Set /file "$PROGRAMFILES\Mozilla Thunderbird\distribution\policies.json" + ClearErrors + nsJSON::Get `policies` /end + ${IfNot} ${Errors} + Pop $R0 + ClearErrors + nsJSON::Get `policies` `ExtensionSettings` /end + ${IfNot} ${Errors} + Pop $R0 + nsJSON::Set `policies` `ExtensionSettings` `systray-x@Ximi1970` /value `{ "installation_mode": "normal_installed", "install_url": "file:///$PROGRAMFILES/Mozilla Thunderbird/distribution/extensions/systray-x@Ximi1970.xpi" }` + ${Else} + nsJSON::Set `policies` `ExtensionSettings` /value `{ "systray-x@Ximi1970" : { "installation_mode": "normal_installed", "install_url": "file:///$PROGRAMFILES/Mozilla Thunderbird/distribution/extensions/systray-x@Ximi1970.xpi" } }` + ${EndIf} ${Else} - File "policies.json" + nsJSON::Set `policies` /value `{ "ExtensionSettings" : { "systray-x@Ximi1970" : { "installation_mode": "normal_installed", "install_url": "file:///$PROGRAMFILES/Mozilla Thunderbird/distribution/extensions/systray-x@Ximi1970.xpi" } } }` ${EndIf} + + nsJSON::Serialize /format /file "$PROGRAMFILES\Mozilla Thunderbird\distribution\policies.json" + ${EndIf} ${EndIf} diff --git a/dist/policies.json b/dist/policies.json deleted file mode 100644 index c92076d..0000000 --- a/dist/policies.json +++ /dev/null @@ -1,10 +0,0 @@ - { - "policies": { - "ExtensionSettings": { - "systray-x@Ximi1970": { - "installation_mode": "normal_installed", - "install_url": "file:///C:/Program Files/Mozilla Thunderbird/distribution/extensions/systray-x@Ximi1970.xpi" - } - } - } -}