From ac6576558a9096ca18525436764de0a947742af0 Mon Sep 17 00:00:00 2001 From: Dennis Trinks Date: Wed, 20 Jun 2012 21:16:18 +0200 Subject: [PATCH] (re)test on sp-winxp1d --- CLIENT_DATA/setup32.ins | 54 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 37d0a54..874d681 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -31,6 +31,7 @@ Set $domainuser.password$ = GetProductProperty ("domainuser.password","values") Set $connectionstr$ = "\\" + $officescan.fqdn$ + "\" + $officescan.sharename$ + " /user:" + $domainuser.loginname$ + " " + $domainuser.password$ + ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; and adds the following variables: ; from builder-product.cfg : all variables definded by attribute WINST[index] @@ -39,7 +40,31 @@ Set $connectionstr$ = "\\" + $officescan.fqdn$ + "\" + $officescan.sharename$ + ; auto generated winst-variables ; $IconFile$: path to product picture ; -@@BUILDER_VARIABLES@@ +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 $$ = "" + ; ---------------------------------------------------------------- ; - Please edit the following values - @@ -70,22 +95,43 @@ else Sub_get_licensekey endif + comment "Start setup program" DosInAnIcon_TMWF -; Winbatch_install -; Sub_check_exitcode + + comment "Copy files" + Files_install /32Bit + + Winbatch_install + Sub_check_exitcode endif [DosInAnIcon_TMWF] +net use f: /delete /y net use f: $connectionstr$ -F:\AutoPcc.exe /Silent + +[Files_install] +copy "F:\Download\agentWin32.msi" %SystemDrive%\tmp\ [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 ================================================================ +%SystemDrive%\tmp\agentWin32.msi /quiet +[Sub_check_exitcode] +comment "Test for installation success via exit code" +set $ExitCode$ = getLastExitCode +; informations to exit codes see +; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx +; http://msdn.microsoft.com/en-us/library/aa368542.aspx +if ($ExitCode$ = "0") + comment "Looks good: setup program gives exitcode zero" +else + comment "Setup program gives a exitcode unequal zero: "+ $ExitCode$ + isFatalError +endif