From 40a20f426ba43aa7ae694811e4de802826fdd5ac Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 6 May 2013 13:33:28 +0200
Subject: [PATCH] extract first

---
 CLIENT_DATA/setup64.ins | 11 +++++++++--
 builder-product.cfg     |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CLIENT_DATA/setup64.ins b/CLIENT_DATA/setup64.ins
index 006c2cf..e272227 100644
--- a/CLIENT_DATA/setup64.ins
+++ b/CLIENT_DATA/setup64.ins
@@ -17,6 +17,7 @@ DefVar $ExitCode$
 DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
+DevVar $RealInstallMsi$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -41,6 +42,8 @@ Set $MinimumSpace$    = "100 MB"
 Set $InstallDir$      = "%ProgramFiles64Dir%\Waterfox"
 ; ----------------------------------------------------------------
 
+Set $RealInstallMsi$ = $LogDir$ + "\" + $ExtractDir$ + "\" + $InstallMsi$
+
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@@ -60,6 +63,8 @@ else
 	
 	comment "Start setup program"
 	ChangeDirectory "%SCRIPTPATH%"
+	Winbatch_extract
+	Sub_check_exitcode
 	Winbatch_install
 	Sub_check_exitcode
 	
@@ -74,9 +79,11 @@ else
 
 endif
 
+[Winbatch_extract]
+"$InstallExe$"   /extract:"$LogDir$"
+
 [Winbatch_install]
-"$InstallExe$" /qb  /l* "$LogDir$\$ProductId$.install_log.txt" ALLUSERS=1 REBOOT=ReallySuppress
-; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
+msiexec /i "$RealInstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress
 
 [Files_install]
 ; copy the ini file to the InstallDir
diff --git a/builder-product.cfg b/builder-product.cfg
index d66728b..2223b61 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -26,6 +26,12 @@ DL_WINST_NAME[1]=InstallExe
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
+WINST_NAME[0]="InstallMsi"
+WINST_VALUE[0]="Watefox Setup.msi"
+
+WINST_NAME[1]="ExtractDir"
+WINST_VALUE[1]="86C0563"
+
 OPSI_INI_SECTION[0]="X86_64"
 OPSI_INI_OPTION[0]="MsiId"
 OPSI_INI_VALUE[0]="{FD7DEB7B-8CEA-44E5-AB2D-7C66786C0563}"