From df3c004c9a1ea44c3065d6c849bd653eb128f001 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Sat, 6 Aug 2022 16:33:15 +0200
Subject: [PATCH] Add version

---
 dist/SysTray-X-32bit.nsi | 10 ++++++++++
 dist/SysTray-X-64bit.nsi |  7 +++++++
 update_version.sh        | 15 +++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/dist/SysTray-X-32bit.nsi b/dist/SysTray-X-32bit.nsi
index e23485a..1b82491 100644
--- a/dist/SysTray-X-32bit.nsi
+++ b/dist/SysTray-X-32bit.nsi
@@ -1,4 +1,8 @@
 !define Name "SysTray-X"
+!define VERSIONMAJOR 0
+!define VERSIONMINOR 9
+!define VERSIONBUILD 2
+
 Name "${Name}"
 Outfile "${Name}-setup32.exe"
 
@@ -66,6 +70,9 @@ 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}$\""
+  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"
 
   File "..\app\SysTray-X\SysTray-X-app\files\icons\SysTray-X.ico"
@@ -80,6 +87,9 @@ Section "Install"
   ${MyStrRep} $0 $0 "\" "\\" 
   WriteRegStr SHCTX "Software\Mozilla\NativeMessagingHosts\SysTray_X" "" "$0"
 
+  AccessControl::GrantOnFile "$INSTDIR\SysTray_X.json" "(S-1-5-32-545)" "GenericRead"
+  Pop $0
+
   ${If} $MultiUser.InstallMode == "CurrentUser"
     ;
     ;	Find all profiles
diff --git a/dist/SysTray-X-64bit.nsi b/dist/SysTray-X-64bit.nsi
index fa7a93d..d4ff959 100644
--- a/dist/SysTray-X-64bit.nsi
+++ b/dist/SysTray-X-64bit.nsi
@@ -1,4 +1,8 @@
 !define Name "SysTray-X"
+!define VERSIONMAJOR 0
+!define VERSIONMINOR 9
+!define VERSIONBUILD 2
+
 Name "${Name}"
 Outfile "${Name}-setup64.exe"
 
@@ -67,6 +71,9 @@ 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}$\""
+  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"
 
   File "..\app\SysTray-X\SysTray-X-app\files\icons\SysTray-X.ico"
diff --git a/update_version.sh b/update_version.sh
index 851d161..a542ad5 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -2,6 +2,11 @@
 
 VERSION=$1
 
+VERSION_AR=(${VERSION//./ })
+VERSION_MAJOR=${VERSION_AR[0]}
+VERSION_MINOR=${VERSION_AR[1]}
+VERSION_BUILD=${VERSION_AR[2]}
+
 SERVICE_FILE="./dist/rpm/kde/_service"
 sed -i -e "s?\(^.*\"revision\">\).*\(</param>\)?\1$VERSION\2?" $SERVICE_FILE
 sed -i -e "s?\(^.*\"versionformat\">\).*\(</param>\)?\1$VERSION\2?" $SERVICE_FILE
@@ -17,6 +22,16 @@ sed -i -e "s?\(^.*\"versionformat\">\).*\(</param>\)?\1$VERSION\2?" $SERVICE_FIL
 MANIFEST_FILE="./webext/manifest.json"
 sed -i -e "s?\(^.*\"version\": \"\).*\(\",\)?\1$VERSION\2?" $MANIFEST_FILE
 
+NSIS32_FILE="./dist/SysTray-X-32bit.nsi"
+sed -i -e "s?\(^!define VERSIONMAJOR \).*?\1$VERSION_MAJOR?" $NSIS32_FILE
+sed -i -e "s?\(^!define VERSIONMINOR \).*?\1$VERSION_MINOR?" $NSIS32_FILE
+sed -i -e "s?\(^!define VERSIONBUILD \).*?\1$VERSION_BUILD?" $NSIS32_FILE
+
+NSIS64_FILE="./dist/SysTray-X-64bit.nsi"
+sed -i -e "s?\(^!define VERSIONMAJOR \).*?\1$VERSION_MAJOR?" $NSIS64_FILE
+sed -i -e "s?\(^!define VERSIONMINOR \).*?\1$VERSION_MINOR?" $NSIS64_FILE
+sed -i -e "s?\(^!define VERSIONBUILD \).*?\1$VERSION_BUILD?" $NSIS64_FILE
+
 BUILD_NUMBER=`git rev-list --count HEAD`
 GIT_HASH=`git rev-parse HEAD`
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`