From cdc9a6d3cd4958638c4e30fe68abf024699e26c6 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 14 Mar 2013 13:46:12 +0100 Subject: [PATCH] update to new opsi builder templates --- CLIENT_DATA/delsub32.ins | 41 +++++++----- CLIENT_DATA/login.ins | 24 +++++++ CLIENT_DATA/opsi-mozilla.thunderbird.ini | 5 ++ CLIENT_DATA/setup32.ins | 84 +++++------------------- CLIENT_DATA/uninstall32.ins | 55 ++++++---------- Thunderbird-Setup-17.0.3esr.exe.sha1sum | 1 - Thunderbird-Setup-17.0.4esr.exe.sha1sum | 1 + builder-product.cfg | 8 ++- 8 files changed, 95 insertions(+), 124 deletions(-) create mode 100644 CLIENT_DATA/login.ins create mode 100644 CLIENT_DATA/opsi-mozilla.thunderbird.ini delete mode 100644 Thunderbird-Setup-17.0.3esr.exe.sha1sum create mode 100644 Thunderbird-Setup-17.0.4esr.exe.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 17aef82..3549085 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -1,24 +1,33 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib gmbh ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ -Set $MsiId$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}' -Set $UninstallProgram$ = $InstallDir$ + "\uninstall\helper.exe" +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ +Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" -Message "Uninstalling " + $ProductId$ + " ..." +if FileExists($IniFile$) + Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","") +endif +Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." +if FileExists($IniFile$) + Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") + Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ + if FileExists($UninstallProgramOld$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old + sub_check_exitcode + endif +endif if FileExists($UninstallProgram$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall sub_check_exitcode endif -if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") - comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" - Winbatch_uninstall_msi - sub_check_exitcode -endif comment "Delete files" Files_uninstall /32Bit @@ -29,18 +38,16 @@ Registry_uninstall /32Bit comment "Delete program shortcuts" LinkFolder_uninstall -[Winbatch_uninstall] -; Choose one of the following examples as basis for program uninstall -; -"$UninstallProgram$" /S +[Winbatch_uninstall_old] +"$UninstallProgramOld$" -ms -[Winbatch_uninstall_msi] -msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress +[Winbatch_uninstall] +"$UninstallProgram$" -ms [Files_uninstall] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; Example for recursively deleting the installation directory: ; -delete -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.ins new file mode 100644 index 0000000..7b85744 --- /dev/null +++ b/CLIENT_DATA/login.ins @@ -0,0 +1,24 @@ +; Copyright (c) uib gmbh (www.uib.de) +; This sourcecode is owned by uib gmbh +; and published under the Terms of the General Public License. +; credits: http://www.opsi.org/en/credits/ + +[Actions] +Message "Profile Patch for VLC ...." + +comment "Did we run this script before ? - and set version stamp in profile" +if getValue("installationstate", getProductMap) = "installed" + comment "Product is installed" + if not (scriptWasExecutedBefore) + comment "loginscript was not run yet " + Files_profile_copy + Registry_currentuser_set + endif +endif + +[Files_profile_copy] +copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME" + +[Registry_currentuser_set] +openkey [HKCU\Software\ACME] +set "show_greeting_window" = "no" diff --git a/CLIENT_DATA/opsi-mozilla.thunderbird.ini b/CLIENT_DATA/opsi-mozilla.thunderbird.ini new file mode 100644 index 0000000..41585d5 --- /dev/null +++ b/CLIENT_DATA/opsi-mozilla.thunderbird.ini @@ -0,0 +1,5 @@ +[X86] + +[COMMON] +PN=name +VERSION=version diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 8d46a91..4e20faf 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -1,21 +1,23 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" -DefVar $MsiId$ DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ +DefVar $IniFile$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ DefVar $InstallDir$ DefVar $ExitCode$ -DefVar $LicenseRequired$ -DefVar $LicenseKey$ -DefVar $LicensePool$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -35,35 +37,30 @@ Set $LogDir$ = "%SystemDrive%\tmp" ;$ProductId$ should be the name of the product in opsi ; therefore please: only lower letters, no umlauts, ; no white space use '-' as a seperator -Set $ProductId$ = "mozilla.thunderbird" Set $MinimumSpace$ = "200 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\Mozilla Thunderbird" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" + if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ - isFatalError + isFatalError "No Space" ; Stop process and set installation status to failed else comment "Show product picture" - ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ + ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ if FileExists("%ScriptPath%\delsub32.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub32.ins" endif - Message "Installing " + $ProductId$ + " ..." - - if $LicenseRequired$ = "true" - comment "Licensing required, reserve license and get license key" - Sub_get_licensekey - endif + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install Sub_check_exitcode @@ -76,26 +73,13 @@ else comment "Create shortcuts" LinkFolder_install - comment "Test for installation success" - ; Test if software marked as installed in registry - ; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "") - ; logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found" - ; isFatalError - ; else - ; comment "Successful Installation" - ; endif - endif [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 -; "$InstallExe$" -ms [Files_install] -; Example of recursively copying some files into the installation directory: -; +copy "$IniCfgFile$" "$InstallDir$" copy -s "%ScriptPath%\X86\*.xpi" "$InstallDir$\distribution\extensions" [Registry_install] @@ -140,44 +124,6 @@ copy -s "%ScriptPath%\X86\*.xpi" "$InstallDir$\distribution\extensions" ; icon_index: 2 ; end_link -[Sub_get_licensekey] -if opsiLicenseManagementEnabled - 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 -else - LogError "Fatal: license required, but license management not enabled" - isFatalError -endif - - [Sub_check_exitcode] comment "Test for installation success via exit code" set $ExitCode$ = getLastExitCode diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index ba4a645..d70490c 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -1,34 +1,45 @@ ; Copyright (c) uib gmbh (www.uib.de) ; This sourcecode is owned by uib gmbh ; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" -DefVar $MsiId$ DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ +DefVar $IniFile$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ DefVar $InstallDir$ -DefVar $LicenseRequired$ -DefVar $LicensePool$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" +; 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] +; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE +; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL +; auto generated winst-variables +; $IconFile$: path to product picture +; +@@BUILDER_VARIABLES@@ + ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "mozilla.thunderbird" Set $InstallDir$ = "%ProgramFiles32Dir%\Mozilla Thunderbird" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." @@ -37,29 +48,3 @@ if FileExists("%ScriptPath%\delsub32.ins") Sub "%ScriptPath%\delsub32.ins" endif -if $LicenseRequired$ = "true" - comment "Licensing required, free license used" - Sub_free_license -endif - -[Sub_free_license] -if opsiLicenseManagementEnabled - comment "License management is enabled and will be used" - - comment "Trying to free license used for the product" - DefVar $result$ - Set $result$ = FreeLicense($LicensePool$) - ; If there is an assignment of a license pool to the product, it is possible to use - ; Set $result$ = FreeLicense("", $ProductId$) - ; - ; If there is an assignment of a license pool to a windows software id, it is possible to use - ; DefVar $WindowsSoftwareId$ - ; $WindowsSoftwareId$ = "..." - ; set $result$ = FreeLicense("", "", $WindowsSoftwareId$) -else - LogError "Error: licensing required, but license management not enabled" - isFatalError -endif - - - diff --git a/Thunderbird-Setup-17.0.3esr.exe.sha1sum b/Thunderbird-Setup-17.0.3esr.exe.sha1sum deleted file mode 100644 index fd49400..0000000 --- a/Thunderbird-Setup-17.0.3esr.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -27210ae723c63b0a84a3839f25c7e0f8876291d7 /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.3/X86/Thunderbird-Setup-17.0.3esr.exe diff --git a/Thunderbird-Setup-17.0.4esr.exe.sha1sum b/Thunderbird-Setup-17.0.4esr.exe.sha1sum new file mode 100644 index 0000000..f2165d1 --- /dev/null +++ b/Thunderbird-Setup-17.0.4esr.exe.sha1sum @@ -0,0 +1 @@ +143c5a548bf9abb598173c3d465f98d6a6e71f4f /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.4/X86/Thunderbird-Setup-17.0.4esr.exe diff --git a/builder-product.cfg b/builder-product.cfg index 956b376..b0c3ea1 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,7 +3,9 @@ ############################ VENDOR="mozilla.org" PN="mozilla.thunderbird" -VERSION="17.0.3" +NAME="Mozilla Thunderbird" +DESCRIPTION="Mozilla Thunderbird ist ein freier eMail Client des Mozilla-Projekts." +VERSION="17.0.4" RELEASE="1" PRIORITY="0" ADVICE="" @@ -12,7 +14,6 @@ ADVICE="" # Valid value: restricted | public TYPE="public" - DL_FILE[0]="Thunderbird-300x300.jpg" DL_SOURCE[0]="http://www.rebron.org/wordpress/wp-content/uploads/2009/07/Thunderbird-300x300.jpg" @@ -56,3 +57,6 @@ DL_SOURCE[8]="http://releases.mozilla.org/pub/mozilla.org/addons/330424/printing DL_ARCH[8]="X86" DL_WINST_NAME[8]=PrintingToolsPluginXpi +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="UninstallProg" +OPSI_INI_VALUE[0]="uninstall\helper.exe"