From a523e2528d813d2ecc4d720aecf5ef7b7425cff8 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Fri, 7 Mar 2014 10:44:05 +0100
Subject: [PATCH] Correct install dir

---
 .../{opsi-PN.ini => opsi-openvpn.client.ini}  |  0
 CLIENT_DATA/setup32.ins                       | 30 ++-----------------
 CLIENT_DATA/uninstall32.ins                   |  2 +-
 3 files changed, 4 insertions(+), 28 deletions(-)
 rename CLIENT_DATA/{opsi-PN.ini => opsi-openvpn.client.ini} (100%)

diff --git a/CLIENT_DATA/opsi-PN.ini b/CLIENT_DATA/opsi-openvpn.client.ini
similarity index 100%
rename from CLIENT_DATA/opsi-PN.ini
rename to CLIENT_DATA/opsi-openvpn.client.ini
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 7f7d6e3..8cd692e 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -36,9 +36,9 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $MinimumSpace$    = "1 MB"
+Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
-Set $InstallDir$      = "%ProgramFiles32Dir%\<path to the product>"
+Set $InstallDir$      = "%ProgramFiles32Dir%\OpenVPN Technologies\OpenVPN Client"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -75,31 +75,7 @@ else
 endif
 
 [Winbatch_install]
-; Choose one of the following examples as basis for your installation
-; You can use $LicenseKey$ var to pass a license key to the installer
-;
-; === Nullsoft Scriptable Install System ================================================================
-; "%ScriptPath%\Setup.exe" /S
-;
-; === MSI package =======================================================================================
-; You may use the parameter PIDKEY=$Licensekey$
-; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
-;
-; === InstallShield + MSI=====================================================================================
-; Attention: The path to the log file should not contain any whitespaces
-; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb! ALLUSERS=1 REBOOT=ReallySuppress"
-; "%ScriptPath%\setup.exe" /s /v" /qb! ALLUSERS=2 REBOOT=ReallySuppress"
-;
-; === InstallShield =====================================================================================
-; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss"
-; You may use an answer file by the parameter /f1"c:\setup.iss"
-; "%ScriptPath%\setup.exe" /s /sms /f2"$LogDir$\$ProductId$.install_log.txt"
-;
-; === Inno Setup ========================================================================================
-; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html
-; You may create setup answer file by: setup.exe /SAVEINF="filename"
-; You may use an answer file by the parameter /LOADINF="filename"
-; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES
+msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
 
 [Files_install]
 ; copy the ini file to the InstallDir
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 1adeaf6..a1ee688 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -32,7 +32,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir$      = "%ProgramFiles32Dir%\<path to the product>"
+Set $InstallDir$      = "%ProgramFiles32Dir%\OpenVPN Technologies\OpenVPN Client"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"