From e2942a785a43c1e0fc0cce2a99f25afcdab56818 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 11 Mar 2013 05:33:11 +0100 Subject: [PATCH] Bump and update to new opsi builder --- CLIENT_DATA/delsub32.ins | 25 ++++++++------ CLIENT_DATA/login.ins | 24 +++++++++++++ CLIENT_DATA/setup32.ins | 34 ++++++++----------- CLIENT_DATA/uninstall32.ins | 16 +++++---- LibreOffice_4.0.0_Win_x86.msi.sha1sum | 1 - ...fice_4.0.0_Win_x86_helppack_de.msi.sha1sum | 1 - LibreOffice_4.0.1_Win_x86.msi.sha1sum | 1 + ...fice_4.0.1_Win_x86_helppack_de.msi.sha1sum | 1 + OPSI/control | 9 ----- ReadMe.txt | 1 + builder-product.cfg | 14 +++++--- 11 files changed, 74 insertions(+), 53 deletions(-) create mode 100644 CLIENT_DATA/login.ins delete mode 100644 LibreOffice_4.0.0_Win_x86.msi.sha1sum delete mode 100644 LibreOffice_4.0.0_Win_x86_helppack_de.msi.sha1sum create mode 100644 LibreOffice_4.0.1_Win_x86.msi.sha1sum create mode 100644 LibreOffice_4.0.1_Win_x86_helppack_de.msi.sha1sum create mode 100644 ReadMe.txt diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 3a4182d..9c6213e 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -1,12 +1,17 @@ ; 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 $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 $MsiIdOldHelpDe$ = GetValueFromInifile($IniFile$,"X86","MsiIdHelpDe","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") @@ -15,12 +20,12 @@ if FileExists($IniFile$) Winbatch_uninstall_help_de_msi_old sub_check_exitcode endif - Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old - sub_check_exitcode - endif + Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old + sub_check_exitcode + endif endif if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdHelpDe$ + "] DisplayName") = "") comment "MSI id " + $MsiIdHelpDe$ + " found in registry, starting msiexec to uninstall" @@ -55,9 +60,9 @@ msiexec /x $MsiIdHelpDe$ /qb! REBOOT=ReallySuppress msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [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/setup32.ins b/CLIENT_DATA/setup32.ins index 81b0c96..6505740 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -1,12 +1,11 @@ ; 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 $MsiIdOld$ DefVar $MsiIdOldHelpDe$ DefVar $IniFile$ @@ -16,6 +15,9 @@ DefVar $ProductId$ DefVar $MinimumSpace$ DefVar $InstallDir$ DefVar $ExitCode$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -35,29 +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$ = "documentfoundation.libreoffice" Set $MinimumSpace$ = "1500 MB" ; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice 3.5" -Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" +Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice" ; ---------------------------------------------------------------- +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$ + " ..." + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install Sub_check_exitcode Winbatch_install_help_de @@ -72,22 +75,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] -msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress +msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION=$InstallDir$ ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 [Winbatch_install_help_de] -msiexec /i "$InstallHelpDeMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress +msiexec /i "$InstallHelpDeMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION=$InstallDir$ ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 [Files_install] ; copy the ini file to the InstallDir diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index 5b663d4..e4c93dc 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -1,20 +1,22 @@ ; 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 $MsiIdOld$ DefVar $MsiIdOldHelpDe$ -DefVar $LogDir$ DefVar $IniFile$ DefVar $IniCfgFile$ +DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ DefVar $InstallDir$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -31,13 +33,13 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "documentfoundation.libreoffice" -Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice 3.5" +Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice" ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." diff --git a/LibreOffice_4.0.0_Win_x86.msi.sha1sum b/LibreOffice_4.0.0_Win_x86.msi.sha1sum deleted file mode 100644 index 0183d9f..0000000 --- a/LibreOffice_4.0.0_Win_x86.msi.sha1sum +++ /dev/null @@ -1 +0,0 @@ -7693379f22e5b323098bd047f598c1efff619b46 /home/mario/.opsi-dist-cache/documentfoundation.libreoffice-4.0.0/X86/LibreOffice_4.0.0_Win_x86.msi diff --git a/LibreOffice_4.0.0_Win_x86_helppack_de.msi.sha1sum b/LibreOffice_4.0.0_Win_x86_helppack_de.msi.sha1sum deleted file mode 100644 index 0d67713..0000000 --- a/LibreOffice_4.0.0_Win_x86_helppack_de.msi.sha1sum +++ /dev/null @@ -1 +0,0 @@ -55ec8c4013ffd7e2e9be1f4598545adeb79fbf15 /home/mario/.opsi-dist-cache/documentfoundation.libreoffice-4.0.0/X86/LibreOffice_4.0.0_Win_x86_helppack_de.msi diff --git a/LibreOffice_4.0.1_Win_x86.msi.sha1sum b/LibreOffice_4.0.1_Win_x86.msi.sha1sum new file mode 100644 index 0000000..98f24b3 --- /dev/null +++ b/LibreOffice_4.0.1_Win_x86.msi.sha1sum @@ -0,0 +1 @@ +9203d0e888cc543c7bec6f702851c4e8d161c51f /home/mario/.opsi-dist-cache/documentfoundation.libreoffice-4.0.1/X86/LibreOffice_4.0.1_Win_x86.msi diff --git a/LibreOffice_4.0.1_Win_x86_helppack_de.msi.sha1sum b/LibreOffice_4.0.1_Win_x86_helppack_de.msi.sha1sum new file mode 100644 index 0000000..7fa8d4e --- /dev/null +++ b/LibreOffice_4.0.1_Win_x86_helppack_de.msi.sha1sum @@ -0,0 +1 @@ +162592ea178917bb46e90aec3cd14c8b836b893a /home/mario/.opsi-dist-cache/documentfoundation.libreoffice-4.0.1/X86/LibreOffice_4.0.1_Win_x86_helppack_de.msi diff --git a/OPSI/control b/OPSI/control index a0d60df..cf344aa 100644 --- a/OPSI/control +++ b/OPSI/control @@ -21,15 +21,6 @@ onceScript: customScript: userLoginScript: -[ProductProperty] -type: unicode -name: install_architecture -multivalue: False -editable: False -description: which architecture (32/64 bit) has to be installed -values: ["32 only", "64 only", "both", "system specific"] -default: ["system specific"] - [ProductDependency] action: setup requiredProduct: sereby.aio diff --git a/ReadMe.txt b/ReadMe.txt new file mode 100644 index 0000000..d779688 --- /dev/null +++ b/ReadMe.txt @@ -0,0 +1 @@ +https://wiki.documentfoundation.org/Deployment_and_Migration diff --git a/builder-product.cfg b/builder-product.cfg index a883d92..c92321d 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,7 +3,9 @@ ############################ VENDOR="libreoffice.org" PN="documentfoundation.libreoffice" -VERSION="4.0.0" +NAME="LibreOffice Productivity Suite" +DESCRIPTION="LibreOffice ist eine leistungsfaehige Office-Suite, voll kompatibel mit den Programmen anderer grosser Office-Anbieter ist." +VERSION="4.0.1" RELEASE="1" PRIORITY="0" ADVICE="" @@ -29,8 +31,10 @@ DL_WINST_NAME[2]=InstallHelpDeMsi # File array index for the image showing while installing the program ICON_DL_INDEX=0 -WINST_NAME[0]="MsiId" -WINST_VALUE[0]="{8EA569F1-97AF-4C3E-A0CB-4846C2D35A81}" +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="MsiId" +OPSI_INI_VALUE[0]="{604B2A5C-B1CE-45B2-ADCC-6B7C721AC3AC}" -WINST_NAME[1]="MsiIdHelpDe" -WINST_VALUE[1]="{766DEEF2-5E05-42EF-B4BC-1BB0D2888229}" +OPSI_INI_SECTION[1]="X86" +OPSI_INI_OPTION[1]="MsiIdHelpDe" +OPSI_INI_VALUE[1]="{0DC7933E-C617-4E46-AA9B-1F5279FFDCF8}"