Changeset 1137 for opsi

Timestamp:

Jan 24, 2013, 3:07:03 PM (11 years ago)

Author:

joergs

Message:

switched from Winbatch to ShellBatch /sysnative. Prevent problem on x64? include wsusoffline native log file

Location:

opsi/products/wsusoffline

Files:

• CLIENT_DATA/setup.ins (modified) (4 diffs)
• OPSI/changelog.txt (modified) (1 diff)
• OPSI/control (modified) (2 diffs)

opsi/products/wsusoffline/CLIENT_DATA/setup.ins

@@ -5 +5 @@
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+; at least 4.11.2, tested with 4.11.3.3
+requiredWinstVersion >= "4.11.3.3"
 
 DefVar $MsiId32$
@@ -47 +48 @@
 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 $InstallDir32$      = "%ProgramFiles32Dir%\<path to the product>"
+;Set $InstallDir64$      = "%ProgramFiles64Dir%\<path to the product>"
+;Set $LicenseRequired$ = "false"
+;Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
@@ -57 +58 @@
         isFatalError
         ; Stop process and set installation status to failed
-else
-        comment "Show product picture"
-        ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
-        
-        ;if FileExists("%ScriptPath%\delsub3264.ins")
-        ;       comment "Start uninstall sub section"
-        ;       Sub "%ScriptPath%\delsub3264.ins"
-        ;endif
-        
-        ;if $LicenseRequired$ = "true"
-        ;       comment "Licensing required, reserve license and get license key"
-        ;       Sub_get_licensekey
-        ;endif
-        
-        comment "installing"
-
-                Message "Installing " + $ProductId$ + " ..."
-                comment "Start setup program"
-                Winbatch_install
-                Sub_check_exitcode
-                ;comment "Copy files"
-                ;Files_install_32 /32Bit
-                ;comment "Patch Registry"
-                ;Registry_install /32Bit
-                ;comment "Create shortcuts"
-                ;LinkFolder_install
-        
 endif
 
-[Winbatch_install]
-"%ScriptPath%\exit-wrapper.cmd" "%ScriptPath%\client\cmd\DoUpdate.cmd" $Options$
+comment "Show product picture"
+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$ + " ..."
+
+comment "Start setup program"
+;Winbatch_install
+Shellbatch_install /sysnative
+
+; include wsusoffline logfile (last 1000 lines)
+includelog "%Systemroot%\wsusofflineupdate.log" "1000"
+
+; check exit code, reboot is required
+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]
+@rem remove old wsusoffline logfile
+del /q "%Systemroot%\wsusofflineupdate.log"
+call "%ScriptPath%\client\cmd\DoUpdate.cmd" $Options$
+exit %ERRORLEVEL%
+
 
 
@@ -102 +113 @@
 ; set "name2" = REG_DWORD:0001
 ; set "name3" = REG_BINARY:00 af 99 cd
-
-[LinkFolder_install]
-; Example of deleting a folder from AllUsers startmenu:
-;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
-;
-; Example of creating an shortcut to the installed exe in AllUsers startmenu:
-;
-; set_basefolder common_programs
-; set_subfolder $ProductId$
-;
-; set_link
-;       name: $ProductId$
-;       target: <path to the program>
-;       parameters:
-;       working_dir: $InstallDir$
-;       icon_file:
-;       icon_index:
-; end_link
-;
-; Example of creating an shortcut to the installed exe on AllUsers desktop:
-;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-;
-; set_link
-;       name: $ProductId$
-;       target: <path to the program>
-;       parameters: <some_param>
-;       working_dir: $InstallDir$
-;       icon_file: <path to icon file>
-;       icon_index: 2
-; end_link
-
-[Sub_get_licensekey]
-comment "License management is enabled and will be used"
-
-comment "Trying to get a license key"
-Set $LicenseKey$ = demandLicenseKey ($LicensePool$)
-; If there is an assignment of exactly one licensepool to the product the following call is possible:
-; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$)
-;
-; If there is an assignment of a license pool to a windows software id, it is possible to use:
-; DefVar $WindowsSoftwareId$
-; $WindowsSoftwareId$ = "..."
-; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$)
-
-DefVar $ServiceErrorClass$
-set $ServiceErrorClass$ = getLastServiceErrorClass
-comment "Error class: " + $ServiceErrorClass$
-
-if $ServiceErrorClass$ = "None"
-        comment "Everything fine, we got the license key '" + $LicenseKey$ + "'"
-else
-        if $ServiceErrorClass$ = "LicenseConfigurationError"
-                LogError "Fatal: license configuration must be corrected"
-                LogError getLastServiceErrorMessage
-                isFatalError
-        else 
-                if $ServiceErrorClass$ = "LicenseMissingError"
-                        LogError "Fatal: required license is not supplied"
-                        isFatalError
-                endif
-        endif
-endif
-
 
 

opsi/products/wsusoffline/OPSI/changelog.txt

@@ +1 @@
+wsusoffline 20130124.800-8 20130124 Joerg Steffens
+  * uses ShellBatch /sysnative instead of Winbatch. Prevents errors on 64bit?
+  * includelog for native wsusoffline log file (1000 lines)
+
 wsusoffline 20121008.741-7 20121008 Joerg Steffens
   * uses wsusoffline 7.4.1 RPM

opsi/products/wsusoffline/OPSI/control

@@ -1 +1 @@
 [Package]
-version: 7
+version: 8
 depends: 
 incremental: False
@@ -10 +10 @@
 description: installs patches from microsoft
 advice: 
-version: 20121008.741
+version: 20130124.800
 priority: -62
 licenseRequired: False