Changeset 1137 for opsi


Ignore:
Timestamp:
01/24/13 15:07:03 (8 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:
3 edited

Legend:

Unmodified
Added
Removed
  • opsi/products/wsusoffline/CLIENT_DATA/setup.ins

    r995 r1137  
    55
    66[Actions]
    7 requiredWinstVersion >= "4.10.8.6"
     7; at least 4.11.2, tested with 4.11.3.3
     8requiredWinstVersion >= "4.11.3.3"
    89
    910DefVar $MsiId32$
     
    4748Set $MinimumSpace$    = "300 MB"
    4849; the path were we find the product after the installation
    49 Set $InstallDir32$      = "%ProgramFiles32Dir%\<path to the product>"
    50 Set $InstallDir64$      = "%ProgramFiles64Dir%\<path to the product>"
    51 Set $LicenseRequired$ = "false"
    52 Set $LicensePool$     = "p_" + $ProductId$
     50;Set $InstallDir32$      = "%ProgramFiles32Dir%\<path to the product>"
     51;Set $InstallDir64$      = "%ProgramFiles64Dir%\<path to the product>"
     52;Set $LicenseRequired$ = "false"
     53;Set $LicensePool$     = "p_" + $ProductId$
    5354; ----------------------------------------------------------------
    5455
     
    5758        isFatalError
    5859        ; Stop process and set installation status to failed
    59 else
    60         comment "Show product picture"
    61         ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
    62        
    63         ;if FileExists("%ScriptPath%\delsub3264.ins")
    64         ;       comment "Start uninstall sub section"
    65         ;       Sub "%ScriptPath%\delsub3264.ins"
    66         ;endif
    67        
    68         ;if $LicenseRequired$ = "true"
    69         ;       comment "Licensing required, reserve license and get license key"
    70         ;       Sub_get_licensekey
    71         ;endif
    72        
    73         comment "installing"
    74 
    75                 Message "Installing " + $ProductId$ + " ..."
    76                 comment "Start setup program"
    77                 Winbatch_install
    78                 Sub_check_exitcode
    79                 ;comment "Copy files"
    80                 ;Files_install_32 /32Bit
    81                 ;comment "Patch Registry"
    82                 ;Registry_install /32Bit
    83                 ;comment "Create shortcuts"
    84                 ;LinkFolder_install
    85        
    8660endif
    8761
    88 [Winbatch_install]
    89 "%ScriptPath%\exit-wrapper.cmd" "%ScriptPath%\client\cmd\DoUpdate.cmd" $Options$
     62comment "Show product picture"
     63ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
     64       
     65;if FileExists("%ScriptPath%\delsub3264.ins")
     66;       comment "Start uninstall sub section"
     67;       Sub "%ScriptPath%\delsub3264.ins"
     68;endif
     69
     70comment "installing"
     71Message "Installing " + $ProductId$ + " ..."
     72
     73comment "Start setup program"
     74;Winbatch_install
     75Shellbatch_install /sysnative
     76
     77; include wsusoffline logfile (last 1000 lines)
     78includelog "%Systemroot%\wsusofflineupdate.log" "1000"
     79
     80; check exit code, reboot is required
     81Sub_check_exitcode
     82
     83;comment "Copy files"
     84;Files_install_32 /32Bit
     85;comment "Patch Registry"
     86;Registry_install /32Bit
     87       
     88
     89
     90;[Winbatch_install]
     91;"%ScriptPath%\exit-wrapper.cmd" "%ScriptPath%\client\cmd\DoUpdate.cmd" $Options$
     92
     93
     94
     95[ShellBatch_install]
     96@rem remove old wsusoffline logfile
     97del /q "%Systemroot%\wsusofflineupdate.log"
     98call "%ScriptPath%\client\cmd\DoUpdate.cmd" $Options$
     99exit %ERRORLEVEL%
     100
    90101
    91102
     
    102113; set "name2" = REG_DWORD:0001
    103114; set "name3" = REG_BINARY:00 af 99 cd
    104 
    105 [LinkFolder_install]
    106 ; Example of deleting a folder from AllUsers startmenu:
    107 ;
    108 ; set_basefolder common_programs
    109 ; delete_subfolder $ProductId$
    110 ;
    111 ; Example of creating an shortcut to the installed exe in AllUsers startmenu:
    112 ;
    113 ; set_basefolder common_programs
    114 ; set_subfolder $ProductId$
    115 ;
    116 ; set_link
    117 ;       name: $ProductId$
    118 ;       target: <path to the program>
    119 ;       parameters:
    120 ;       working_dir: $InstallDir$
    121 ;       icon_file:
    122 ;       icon_index:
    123 ; end_link
    124 ;
    125 ; Example of creating an shortcut to the installed exe on AllUsers desktop:
    126 ;
    127 ; set_basefolder common_desktopdirectory
    128 ; set_subfolder ""
    129 ;
    130 ; set_link
    131 ;       name: $ProductId$
    132 ;       target: <path to the program>
    133 ;       parameters: <some_param>
    134 ;       working_dir: $InstallDir$
    135 ;       icon_file: <path to icon file>
    136 ;       icon_index: 2
    137 ; end_link
    138 
    139 [Sub_get_licensekey]
    140 comment "License management is enabled and will be used"
    141 
    142 comment "Trying to get a license key"
    143 Set $LicenseKey$ = demandLicenseKey ($LicensePool$)
    144 ; If there is an assignment of exactly one licensepool to the product the following call is possible:
    145 ; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$)
    146 ;
    147 ; If there is an assignment of a license pool to a windows software id, it is possible to use:
    148 ; DefVar $WindowsSoftwareId$
    149 ; $WindowsSoftwareId$ = "..."
    150 ; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$)
    151 
    152 DefVar $ServiceErrorClass$
    153 set $ServiceErrorClass$ = getLastServiceErrorClass
    154 comment "Error class: " + $ServiceErrorClass$
    155 
    156 if $ServiceErrorClass$ = "None"
    157         comment "Everything fine, we got the license key '" + $LicenseKey$ + "'"
    158 else
    159         if $ServiceErrorClass$ = "LicenseConfigurationError"
    160                 LogError "Fatal: license configuration must be corrected"
    161                 LogError getLastServiceErrorMessage
    162                 isFatalError
    163         else
    164                 if $ServiceErrorClass$ = "LicenseMissingError"
    165                         LogError "Fatal: required license is not supplied"
    166                         isFatalError
    167                 endif
    168         endif
    169 endif
    170 
    171115
    172116
  • opsi/products/wsusoffline/OPSI/changelog.txt

    r1115 r1137  
     1wsusoffline 20130124.800-8 20130124 Joerg Steffens
     2  * uses ShellBatch /sysnative instead of Winbatch. Prevents errors on 64bit?
     3  * includelog for native wsusoffline log file (1000 lines)
     4
    15wsusoffline 20121008.741-7 20121008 Joerg Steffens
    26  * uses wsusoffline 7.4.1 RPM
  • opsi/products/wsusoffline/OPSI/control

    r1115 r1137  
    11[Package]
    2 version: 7
     2version: 8
    33depends:
    44incremental: False
     
    1010description: installs patches from microsoft
    1111advice:
    12 version: 20121008.741
     12version: 20130124.800
    1313priority: -62
    1414licenseRequired: False
Note: See TracChangeset for help on using the changeset viewer.