Changeset 1156 for opsi/products/wsusoffline/CLIENT_DATA

Timestamp:

Jul 4, 2013, 5:16:57 PM (11 years ago)

Author:

joergs

Message:

bugfix 64bit, cleanup

Location:

opsi/products/wsusoffline/CLIENT_DATA

Files:

• client (added)
• exit-wrapper.cmd (deleted)
• setup.ins (modified) (6 diffs)

opsi/products/wsusoffline/CLIENT_DATA/setup.ins

@@ -8 +8 @@
 requiredWinstVersion >= "4.11.3.3"
 
-DefVar $MsiId32$
-DefVar $UninstallProgram32$
-DefVar $MsiId64$
-DefVar $UninstallProgram64$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
-DefVar $InstallDir32$
-DefVar $InstallDir64$
 DefVar $ExitCode$
-DefVar $LicenseRequired$
-DefVar $LicenseKey$
-DefVar $LicensePool$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
@@ -46 +37 @@
 ; no white space use '-' as a seperator
 Set $ProductId$       = "wsusoffline"
-Set $MinimumSpace$    = "300 MB"
-; the path were we find the product after the installation
-;Set $InstallDir32$      = "%ProgramFiles32Dir%\<path to the product>"
-;Set $InstallDir64$      = "%ProgramFiles64Dir%\<path to the product>"
-;Set $LicenseRequired$ = "false"
-;Set $LicensePool$     = "p_" + $ProductId$
+Set $MinimumSpace$    = "1000 MB"
 ; ----------------------------------------------------------------
 
@@ -63 +49 @@
 ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
         
-;if FileExists("%ScriptPath%\delsub3264.ins")
-;       comment "Start uninstall sub section"
-;       Sub "%ScriptPath%\delsub3264.ins"
-;endif
-
 comment "installing"
 Message "Installing " + $ProductId$ + " ..."
@@ -73 +54 @@
 comment "Start setup program"
 ;Winbatch_install
-Shellbatch_install /sysnative
+Shellbatch_install /winst /sysnative
 
 ; include wsusoffline logfile (last 1000 lines)
@@ -81 +62 @@
 Sub_check_exitcode
 
-;comment "Copy files"
-;Files_install_32 /32Bit
-;comment "Patch Registry"
-;Registry_install /32Bit
-        
-
-
-;[Winbatch_install]
-;"%ScriptPath%\exit-wrapper.cmd" "%ScriptPath%\client\cmd\DoUpdate.cmd" $Options$
-
-
 
 [ShellBatch_install]
@@ -98 +68 @@
 call "%ScriptPath%\client\cmd\DoUpdate.cmd" $Options$
 exit %ERRORLEVEL%
-
-
-
-[Files_install_32]
-; Example of recursively copying some files into the installation directory:
-;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
-
-[Registry_install]
-; Example of setting some values of an registry key:
-;
-; openkey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
-; set "name1" = "some string value"
-; set "name2" = REG_DWORD:0001
-; set "name3" = REG_BINARY:00 af 99 cd