From 76a45930839dc51dbf45919023078f683a5208a5 Mon Sep 17 00:00:00 2001
From: Dennis Trinks <dennis.trinks@dtnet.de>
Date: Thu, 28 Jun 2012 15:34:22 +0200
Subject: [PATCH] separated vc++2005 lib

---
 CLIENT_DATA/setup32.ins | 73 +++++++++++++++++++++--------------------
 builder-product.cfg     |  7 ++--
 vcredistx86.exe.sha1sum |  1 +
 3 files changed, 44 insertions(+), 37 deletions(-)
 create mode 100644 vcredistx86.exe.sha1sum

diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index c469c85..2d42223 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -42,31 +42,7 @@ Set $connectionstr$ = "\\" + $officescan.fqdn$ + "\" + $officescan.sharename$ +
 ;   auto generated winst-variables
 ;         $IconFile$: path to product picture
 ;
-DefVar $VENDOR$
-Set    $VENDOR$ = "trendmicro"
-DefVar $PN$
-Set    $PN$ = "trendmicro.wfbsstd7"
-DefVar $VERSION$
-Set    $VERSION$ = "1"
-DefVar $RELEASE$
-Set    $RELEASE$ = "1"
-DefVar $PRIORITY$
-Set    $PRIORITY$ = "0"
-DefVar $ADVICE$
-Set    $ADVICE$ = "Trend Micro Worry Free Business Std. Edition V7 Installation"
-DefVar $TYPE$
-Set    $TYPE$ = "public"
-DefVar $CREATOR_TAG$
-Set    $CREATOR_TAG$ = "dtn"
-DefVar $CREATOR_NAME$
-Set    $CREATOR_NAME$ = "OPSI-Builder"
-DefVar $CREATOR_EMAIL$
-Set    $CREATOR_EMAIL$ = "info@dtnet.de"
-DefVar $IconFile$
-Set    $IconFile$ = "%ScriptPath%\trendmicro.wfbsstd7.png"
-DefVar $$
-Set    $$ = ""
-
+@@BUILDER_VARIABLES@@
 
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
@@ -97,12 +73,12 @@ else
 		Sub_get_licensekey
 	endif
 	
-        if FileExists($msifile$)
-           DosInAnIcon_delmsi
-        EndIf
+
+        DosInAnIcon_delmsi
+        DosInAnIcon_delvcredist
 
 	comment "Start setup program"
-        DosInAnIcon_TMWF
+        DosInAnIcon_mount
 
 	comment "Copy files"
         Files_install /32Bit
@@ -111,23 +87,50 @@ else
            isFatalError
         Endif
 
-        Winbatch_install
+        comment "Extracting VC++ 2005 Lib"
+        Winbatch_install_extract
 	Sub_check_exitcode
 
+        if not (FileExists($LogDir$+"\vcredist.msi"))
+           isFatalError
+        Endif
+
+        comment "Installing VC++ 2005 Lib"
+        Winbatch_install_vcredist
+        Sub_check_exitcode
+
+        comment "Installing TM Worry Free"
+        Winbatch_install_wf
+        Sub_check_exitcode
+        
+        comment "Cleanup Files"
+        DosInAnIcon_delvcredist        
+        DosInAnIcon_delmsi
 endif
 
-[DosInAnIcon_TMWF]
+[DosInAnIcon_mount]
 net use f: /delete /y
 net use f: $connectionstr$
 
 [DosInAnIcon_delmsi]
 del $msifile$
 
-[Files_install]
-copy "F:\Download\agentWin32.msi" %SystemDrive%\tmp\
+[DosInAnIcon_delvcredist]
+del $LogDir$\vcredist.msi
+del $LogDir$\vcredis1.cab
+
+[Files_install]
+copy "F:\Download\agentWin32.msi" $LogDir$
+
+[Winbatch_install_extract]
+$vcredist86Exe$ /Q /C /T:$LogDir$
+
+[Winbatch_install_vcredist]
+$LogDir$\vcredist.msi /quiet
+
+[Winbatch_install_wf]
+$msifile$ /quiet
 
-[Winbatch_install]
-%SystemDrive%\tmp\agentWin32.msi /quiet
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"
diff --git a/builder-product.cfg b/builder-product.cfg
index 9d203cc..9cd9ab7 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -15,6 +15,9 @@ TYPE="public"
 DL_FILE[0]="trendmicro.wfbsstd7.jpg"
 DL_SOURCE[0]="http://siliconangle.com/files/2011/01/trend-micro-logo.jpg"
 
-WINST_NAME[1]="MyVar"
-WINST_VALUE[1]="My content"
+DL_FILE[1]="vcredistx86.exe"
+DL_SOURCE[1]="http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE"
+DL_ARCH[1]="X86"
+DL_WINST_NAME[1]=vcredist86Exe
 
+ICON_DL_INDEX=0
diff --git a/vcredistx86.exe.sha1sum b/vcredistx86.exe.sha1sum
new file mode 100644
index 0000000..1df83e7
--- /dev/null
+++ b/vcredistx86.exe.sha1sum
@@ -0,0 +1 @@
+b8fab0bb7f62a24ddfe77b19cd9a1451abd7b847  /home/dtrinks/.opsi-dist-cache/trendmicro/trendmicro.wfbsstd7/1/X86/vcredistx86.exe