Cleanup source tree

This commit is contained in:
Mario Fetka 2014-02-21 12:09:13 +01:00
parent 7524ae12c1
commit 1a6fa309f1
2 changed files with 161 additions and 161 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,161 +1,161 @@
; Copyright (c) uib gmbh (www.uib.de) ; Copyright (c) uib gmbh (www.uib.de)
; This sourcecode is owned by uib ; This sourcecode is owned by uib
; and published under the Terms of the General Public License. ; and published under the Terms of the General Public License.
; credits: http://www.opsi.org/credits/ ; credits: http://www.opsi.org/credits/
[Actions] [Actions]
requiredWinstVersion >= "4.11.1.1" requiredWinstVersion >= "4.11.1.1"
DefVar $LogDir$ DefVar $LogDir$
DefVar $ProductId$ DefVar $ProductId$
DefVar $LicenseRequired$ DefVar $LicenseRequired$
DefVar $LicenseKey$ DefVar $LicenseKey$
DefVar $LicensePool$ DefVar $LicensePool$
DefVar $poolOrKey$ DefVar $poolOrKey$
DefVar $source$ DefVar $source$
DefVar $httpproxy$ DefVar $httpproxy$
Set $LogDir$ = "%SystemDrive%\tmp" Set $LogDir$ = "%SystemDrive%\tmp"
Set $ProductId$ = "activate-win" Set $ProductId$ = "activate-win"
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
; see: ; see:
; http://technet.microsoft.com/en-us/library/ff793433.aspx ; http://technet.microsoft.com/en-us/library/ff793433.aspx
if GetMsVersionInfo < "6" if GetMsVersionInfo < "6"
LogError "This is for NT 6 (Vista) and above" LogError "This is for NT 6 (Vista) and above"
isFatalError isFatalError
else else
comment "Show product picture" comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
Message "Installing " + $ProductId$ + " ..." Message "Installing " + $ProductId$ + " ..."
set $poolOrKey$ = GetProductProperty("Poolid-or-Licensekey","") set $poolOrKey$ = GetProductProperty("Poolid-or-Licensekey","")
set $source$ = GetProductProperty("method","only-activate") set $source$ = GetProductProperty("method","only-activate")
set $httpproxy$ = GetProductProperty("httpproxy","") set $httpproxy$ = GetProductProperty("httpproxy","")
comment "Check Status" comment "Check Status"
DosInAnIcon_status_win7 winst /sysnative DosInAnIcon_status_win7 winst /sysnative
if not ( $httpproxy$ = "" ) if not ( $httpproxy$ = "" )
comment "enable HTTP proxy, required for auto-activating" comment "enable HTTP proxy, required for auto-activating"
DosInAnIcon_setproxy_win7 winst /sysnative DosInAnIcon_setproxy_win7 winst /sysnative
endif endif
if not ($source$ = "only-activate") if not ($source$ = "only-activate")
comment " we need a key..." comment " we need a key..."
if $source$ = "opsi License management" if $source$ = "opsi License management"
Set $LicenseRequired$ = "true" Set $LicenseRequired$ = "true"
Set $LicensePool$ = $poolOrKey$ Set $LicensePool$ = $poolOrKey$
comment " get key from license management with poolid "+$LicensePool$ comment " get key from license management with poolid "+$LicensePool$
comment "Licensing required, reserve license and get license key" comment "Licensing required, reserve license and get license key"
Sub_get_licensekey Sub_get_licensekey
else else
Set $LicenseRequired$ = "false" Set $LicenseRequired$ = "false"
Set $LicensePool$ = "" Set $LicensePool$ = ""
set $LicenseKey$ = $poolOrKey$ set $LicenseKey$ = $poolOrKey$
comment " use key "+$LicenseKey$ comment " use key "+$LicenseKey$
endif endif
comment "Set the Key" comment "Set the Key"
DosInAnIcon_set_key winst /sysnative DosInAnIcon_set_key winst /sysnative
comment "Check Status" comment "Check Status"
DosInAnIcon_status_win7 winst /sysnative DosInAnIcon_status_win7 winst /sysnative
endif endif
comment "Start Activation" comment "Start Activation"
DosInAnIcon_activate winst /sysnative DosInAnIcon_activate winst /sysnative
comment "Check Status" comment "Check Status"
DosInAnIcon_status_win7 winst /sysnative DosInAnIcon_status_win7 winst /sysnative
endif endif
[DosInAnIcon_set_key] [DosInAnIcon_set_key]
cscript //b c:\windows\system32\slmgr.vbs /ipk $LicenseKey$ cscript //b c:\windows\system32\slmgr.vbs /ipk $LicenseKey$
[DosInAnIcon_activate] [DosInAnIcon_activate]
cscript //b c:\windows\system32\slmgr.vbs /ato cscript //b c:\windows\system32\slmgr.vbs /ato
[DosInAnIcon_status_win7] [DosInAnIcon_status_win7]
cscript c:\windows\system32\slmgr.vbs /dli cscript c:\windows\system32\slmgr.vbs /dli
[Sub_get_licensekey] [Sub_get_licensekey]
if opsiLicenseManagementEnabled if opsiLicenseManagementEnabled
comment "License management is enabled and will be used" comment "License management is enabled and will be used"
comment "Trying to get a license key" comment "Trying to get a license key"
Set $LicenseKey$ = demandLicenseKey ($LicensePool$) Set $LicenseKey$ = demandLicenseKey ($LicensePool$)
; If there is an assignment of exactly one licensepool to the product the following call is possible: ; If there is an assignment of exactly one licensepool to the product the following call is possible:
; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$) ; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$)
; ;
; If there is an assignment of a license pool to a windows software id, it is possible to use: ; If there is an assignment of a license pool to a windows software id, it is possible to use:
; DefVar $WindowsSoftwareId$ ; DefVar $WindowsSoftwareId$
; $WindowsSoftwareId$ = "..." ; $WindowsSoftwareId$ = "..."
; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$) ; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$)
DefVar $ServiceErrorClass$ DefVar $ServiceErrorClass$
set $ServiceErrorClass$ = getLastServiceErrorClass set $ServiceErrorClass$ = getLastServiceErrorClass
comment "Error class: " + $ServiceErrorClass$ comment "Error class: " + $ServiceErrorClass$
if $ServiceErrorClass$ = "None" if $ServiceErrorClass$ = "None"
comment "Everything fine, we got the license key '" + $LicenseKey$ + "'" comment "Everything fine, we got the license key '" + $LicenseKey$ + "'"
else else
if $ServiceErrorClass$ = "LicenseConfigurationError" if $ServiceErrorClass$ = "LicenseConfigurationError"
LogError "Fatal: license configuration must be corrected" LogError "Fatal: license configuration must be corrected"
LogError getLastServiceErrorMessage LogError getLastServiceErrorMessage
isFatalError isFatalError
else else
if $ServiceErrorClass$ = "LicenseMissingError" if $ServiceErrorClass$ = "LicenseMissingError"
LogError "Fatal: required license is not supplied" LogError "Fatal: required license is not supplied"
isFatalError isFatalError
endif endif
endif endif
endif endif
else else
LogError "Fatal: license required, but license management not enabled" LogError "Fatal: license required, but license management not enabled"
isFatalError isFatalError
endif endif
[Sub_check_exitcode] [Sub_check_exitcode]
comment "Test for installation success via exit code" comment "Test for installation success via exit code"
set $ExitCode$ = getLastExitCode set $ExitCode$ = getLastExitCode
; informations to exit codes see ; informations to exit codes see
; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx ; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx
; http://msdn.microsoft.com/en-us/library/aa368542.aspx ; http://msdn.microsoft.com/en-us/library/aa368542.aspx
if ($ExitCode$ = "0") if ($ExitCode$ = "0")
comment "Looks good: setup program gives exitcode zero" comment "Looks good: setup program gives exitcode zero"
else else
comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ comment "Setup program gives a exitcode unequal zero: " + $ExitCode$
if ($ExitCode$ = "1605") if ($ExitCode$ = "1605")
comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed." comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed."
comment "Uninstall of a not installed product failed - no problem" comment "Uninstall of a not installed product failed - no problem"
else else
if ($ExitCode$ = "1641") if ($ExitCode$ = "1641")
comment "looks good: setup program gives exitcode 1641" comment "looks good: setup program gives exitcode 1641"
comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success." comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success."
else else
if ($ExitCode$ = "3010") if ($ExitCode$ = "3010")
comment "looks good: setup program gives exitcode 3010" comment "looks good: setup program gives exitcode 3010"
comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success." comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success."
else else
logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$
isFatalError isFatalError
endif endif
endif endif
endif endif
endif endif
[DosInAnIcon_setproxy_win7] [DosInAnIcon_setproxy_win7]
;netsh.exe winhttp set proxy proxy:3128 "<local>;*.mynet.local" ;netsh.exe winhttp set proxy proxy:3128 "<local>;*.mynet.local"
netsh.exe winhttp set proxy $httpproxy$ netsh.exe winhttp set proxy $httpproxy$