From 84cbdd214e5a71f07bd55c56532c758f0d40a4c7 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 21 Aug 2013 11:45:36 +0200
Subject: [PATCH] install for all users and correct install dir

---
 CLIENT_DATA/delsub32.ins                  | 20 ++------------------
 CLIENT_DATA/opsi-melk.capslockgoodbye.ini |  2 +-
 CLIENT_DATA/setup32.ins                   |  2 +-
 CLIENT_DATA/uninstall32.ins               |  2 +-
 builder-product.cfg                       |  2 +-
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index b83987c..87c2077 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -39,27 +39,11 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_old]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; maby better Call as
-; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
-; "$UninstallProgramOld$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+"$UninstallProgramOld$" /silent /uninstall
 
 
 [Winbatch_uninstall]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; maby better Call as
-; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
-; "$UninstallProgram$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgram$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+"$UninstallProgram$" /silent /uninstall
 
 
 [Files_uninstall]
diff --git a/CLIENT_DATA/opsi-melk.capslockgoodbye.ini b/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
index 177908a..d603fda 100644
--- a/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
+++ b/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
@@ -8,7 +8,7 @@ VERSION=version
 AddUninstall=1
 AddUninstallShortcut=1
 DesktopShortcut=1
-InstallTo=2
+InstallTo=1
 StartMenuShortcut=1
 NoUserInteraction=1
 InstallFolder=%zi.ProgramFiles%\%zi.ProductName%
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index f56999d..0ecdefe 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -39,7 +39,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; no white space use '-' as a seperator
 Set $MinimumSpace$    = "4 MB"
 ; the path were we find the product after the installation
-Set $InstallDir$      = "%ProgramFiles32Dir%\Melk\CapsLock Goodbye"
+Set $InstallDir$      = "%ProgramFiles32Dir%\CapsLock Goodbye"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 3785350..0ac5e60 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -33,7 +33,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir$      = "%ProgramFiles32Dir%\Melk\CapsLock Goodbye"
+Set $InstallDir$      = "%ProgramFiles32Dir%\CapsLock Goodbye"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
diff --git a/builder-product.cfg b/builder-product.cfg
index f9a2b2d..be7b9e9 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -28,7 +28,7 @@ ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="UninstallProg"
-OPSI_INI_VALUE[0]="capslockgoodbye.exe"
+OPSI_INI_VALUE[0]="zipinst.exe"
 
 OPSI_INI_SECTION[1]="install"
 OPSI_INI_OPTION[1]="ProductVersion"