1.1.5

version bump
xan105 · Sep 10, 2019 · fe8962b · fe8962b
1 parent 6e02d8e
commit fe8962b
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 17 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "Achievement-Watcher",
  "description": "A sexy achievement file parser with real-time notification.",
- "version": "1.1.4",
+ "version": "1.1.5",
  "main": "init.js",
  "scripts": {
  "start": "electron .",

diff --git a/service/rcedit-watchdog.cmd b/service/rcedit-watchdog.cmd
@@ -1,2 +1,2 @@
 @echo off
-%~dp0rcedit-x64.exe %userprofile%\.pkg-cache\v2.6\fetched-v12.2.0-win-x64 --set-icon %~dp0icon.ico --set-file-version "1.1.4" --set-product-version "1.1.4" --set-version-string "CompanyName" "Anthony Beaumont" --set-version-string "ProductName" "Achievement Watchdog" --set-version-string "FileDescription" "Achievement Watchdog" --set-version-string "OriginalFilename" "watchdogd.exe" --set-version-string "InternalName" "watchdog" --set-version-string "LegalCopyright" "Copyright 2019 Anthony Beaumont."
+%~dp0rcedit-x64.exe %userprofile%\.pkg-cache\v2.6\fetched-v12.2.0-win-x64 --set-icon %~dp0icon.ico --set-file-version "1.1.5" --set-product-version "1.1.5" --set-version-string "CompanyName" "Anthony Beaumont" --set-version-string "ProductName" "Achievement Watchdog" --set-version-string "FileDescription" "Achievement Watchdog" --set-version-string "OriginalFilename" "watchdogd.exe" --set-version-string "InternalName" "watchdog" --set-version-string "LegalCopyright" "Copyright 2019 Anthony Beaumont."
diff --git a/service/src/souvenir/src/regedit/regedit.go b/service/src/souvenir/src/regedit/regedit.go
@@ -1,3 +1,5 @@
+//stripdown version of https://github.com/xan105/go-dll-regedit
+
 package regedit
 
 import (
@@ -24,16 +26,15 @@ func GetHKEY(root string) registry.Key {
 
 }
 
-func RegQueryStringValue(root string, key string, name string) string { // REG_SZ & REG_EXPAND_SZ
+func RegQueryStringValueAndExpand(root string, key string, name string) string { // REG_SZ & REG_EXPAND_SZ (expands environment-variable strings)
 
  var result string
  HKEY := GetHKEY(root)
 
  k, _ := registry.OpenKey(HKEY , key, registry.QUERY_VALUE)
  defer k.Close()
- result, _, _ = k.GetStringValue(name)
-
- result, _ = registry.ExpandString(result)
+ s, _, _ := k.GetStringValue(name)
+ result, _ = registry.ExpandString(s)
 
  return result
 }
diff --git a/service/src/souvenir/src/souvenir/resource_windows_386.syso b/service/src/souvenir/src/souvenir/resource_windows_386.syso
diff --git a/service/src/souvenir/src/souvenir/resource_windows_amd64.syso b/service/src/souvenir/src/souvenir/resource_windows_amd64.syso
diff --git a/service/src/souvenir/src/souvenir/souvenir.go b/service/src/souvenir/src/souvenir/souvenir.go
@@ -27,7 +27,7 @@ package main
  log.Fatal(err)
  }
 
- dir := path.Join(regedit.RegQueryStringValue("HKCU","Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders","My Pictures"),game)
+ dir := path.Join(regedit.RegQueryStringValueAndExpand("HKCU","Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders","My Pictures"),game)
  err = os.MkdirAll(dir, os.ModePerm)
  if err != nil {
  log.Fatal(err)

diff --git a/service/src/souvenir/src/souvenir/versioninfo.json b/service/src/souvenir/src/souvenir/versioninfo.json
@@ -4,13 +4,13 @@
  "FileVersion": {
  "Major": 1,
  "Minor": 1,
- "Patch": 3,
+ "Patch": 5,
  "Build": 0
  },
  "ProductVersion": {
  "Major": 1,
  "Minor": 1,
- "Patch": 3,
+ "Patch": 5,
  "Build": 0
  },
  "FileFlagsMask": "3f",
@@ -24,14 +24,14 @@
  "Comments": "",
  "CompanyName": "Anthony Beaumont",
  "FileDescription": "Souvenir",
- "FileVersion": "1.1.3",
+ "FileVersion": "1.1.5",
  "InternalName": "Souvenir",
  "LegalCopyright": "Copyright 2019 Anthony Beaumont.",
  "LegalTrademarks": "",
  "OriginalFilename": "Souvenir.dll",
  "PrivateBuild": "",
  "ProductName": "Souvenir",
- "ProductVersion": "1.1.3",
+ "ProductVersion": "1.1.5",
  "SpecialBuild": ""
  },
  "VarFileInfo":

diff --git a/service/src/watchdog/package-lock.json b/service/src/watchdog/package-lock.json
diff --git a/service/src/watchdog/package.json b/service/src/watchdog/package.json
@@ -1,7 +1,7 @@
 {
  "name": "Achievement-Watchdog",
  "description": "Sidekick to Achievement Watcher for live notification on achievement unlocking",
- "version": "1.1.4",
+ "version": "1.1.5",
  "main": "watchdog.js",
  "scripts": {
  "start": "node watchdog.js",

diff --git a/setup/AchievementWatcher.iss b/setup/AchievementWatcher.iss
@@ -8,7 +8,7 @@
 [Setup]
 #define AppUserModelID "io.github.xan105.achievement.watcher"
 #define AppName "Achievement Watcher"
-#define OurVersion "1.1.4"
+#define OurVersion "1.1.5"
 #define Author "Anthony Beaumont"
 #define Website "https://github.com/xan105/Achievement-Watcher"
 #define DonationURL "https://www.paypal.me/xan105"

diff --git a/setup/rcedit.cmd b/setup/rcedit.cmd
@@ -1,4 +1,4 @@
 @echo off
 xcopy /Y ..\app\node_modules\electron\dist\electron.exe prod\AchievementWatcher.exe 
-rcedit-x64.exe prod\AchievementWatcher.exe --set-icon %~dp0prod/icon.ico --set-file-version "1.1.4" --set-product-version "1.1.4" --set-version-string "CompanyName" "Anthony Beaumont" --set-version-string "ProductName" "Achievement Watcher" --set-version-string "FileDescription" "Achievement Watcher" --set-version-string "OriginalFilename" "AchievementWatcher.exe" --set-version-string "InternalName" "AchievementWatcher" --set-version-string "LegalCopyright" "Copyright 2019 Anthony Beaumont."
+rcedit-x64.exe prod\AchievementWatcher.exe --set-icon %~dp0prod/icon.ico --set-file-version "1.1.5" --set-product-version "1.1.5" --set-version-string "CompanyName" "Anthony Beaumont" --set-version-string "ProductName" "Achievement Watcher" --set-version-string "FileDescription" "Achievement Watcher" --set-version-string "OriginalFilename" "AchievementWatcher.exe" --set-version-string "InternalName" "AchievementWatcher" --set-version-string "LegalCopyright" "Copyright 2019 Anthony Beaumont."
 PAUSE
diff --git a/setup/version.ini b/setup/version.ini
@@ -1,2 +1,2 @@
 [version]
-latest=1.1.4
+latest=1.1.5