From ba05fbef8501d4dc09c1d41051ca1e820d25bf1d Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 18 Jul 2019 16:07:45 +0200
Subject: [pkg] fix windows paths after testing

---
 branding/templates/windows/payload/uninstall | 2 +-
 branding/templates/windows/readme.txt        | 1 +
 branding/templates/windows/template.nsi      | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 branding/templates/windows/readme.txt

(limited to 'branding/templates/windows')

diff --git a/branding/templates/windows/payload/uninstall b/branding/templates/windows/payload/uninstall
index 7c7df24..f0a1687 100755
--- a/branding/templates/windows/payload/uninstall
+++ b/branding/templates/windows/payload/uninstall
@@ -8,6 +8,6 @@ libpkcs11-helper-1.dll
 libcrypto-1_1-x64.dll
 libssl-1_1-x64.dll
 padlock.dll
-bitmask_helper.exe
+bitmask-helper.exe
 bitmask-vpn.exe
 tap-windows.exe
diff --git a/branding/templates/windows/readme.txt b/branding/templates/windows/readme.txt
new file mode 100644
index 0000000..a519f1a
--- /dev/null
+++ b/branding/templates/windows/readme.txt
@@ -0,0 +1 @@
+BitmaskVPN for Windows.
diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi
index f644b89..00118e1 100755
--- a/branding/templates/windows/template.nsi
+++ b/branding/templates/windows/template.nsi
@@ -4,7 +4,7 @@ SetCompressor /SOLID lzma
 !include "MUI2.nsh"
 
 Name "$applicationName"
-Outfile "..\bin\$applicationName-$version.exe"
+Outfile "..\dist\$applicationName-$version.exe"
 ;TODO make the installdir configurable - and set it in the registry.
 InstallDir "C:\Program Files\$applicationName\"
 RequestExecutionLevel admin
@@ -87,7 +87,7 @@ SectionEnd
 
 Section "InstallService"
   ; Easy service management thanks to nssm
-  ExecWait '"$INSTDIR\nssm.exe" install $applicationNameLower-helper "$INSTDIR\bitmask_helper.exe"'
+  ExecWait '"$INSTDIR\nssm.exe" install $applicationNameLower-helper "$INSTDIR\bitmask-helper.exe"'
   ExecWait '"$INSTDIR\nssm.exe" set $applicationNameLower-helper AppDirectory "$INSTDIR"'
   ExecWait '"$INSTDIR\nssm.exe" start $applicationNameLower-helper'
 SectionEnd
-- 
cgit v1.2.3