From 14193fd47da420947c69b18b9362d175afa2bfb4 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 27 Aug 2016 09:35:47 +0200 Subject: [PATCH] Add support for x86_64 and install per os specific --- CLIENT_DATA/delsub32.ins | 112 ------------ CLIENT_DATA/delsub3264.ins | 170 ++++++++++++++++++ CLIENT_DATA/{setup32.ins => setup3264.ins} | 99 ++++++---- .../{uninstall32.ins => uninstall3264.ins} | 22 ++- LibreOffice_5.2.0_Win_x64.msi.sha1sum | 1 + ...fice_5.2.0_Win_x64_helppack_de.msi.sha1sum | 1 + OPSI/control | 30 ++-- builder-product.cfg | 32 +++- 8 files changed, 301 insertions(+), 166 deletions(-) delete mode 100644 CLIENT_DATA/delsub32.ins create mode 100644 CLIENT_DATA/delsub3264.ins rename CLIENT_DATA/{setup32.ins => setup3264.ins} (58%) rename CLIENT_DATA/{uninstall32.ins => uninstall3264.ins} (73%) create mode 100644 LibreOffice_5.2.0_Win_x64.msi.sha1sum create mode 100644 LibreOffice_5.2.0_Win_x64_helppack_de.msi.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins deleted file mode 100644 index 9c6213e..0000000 --- a/CLIENT_DATA/delsub32.ins +++ /dev/null @@ -1,112 +0,0 @@ -; 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/ - - -Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" - -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}") - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOldHelpDe$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" - 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 -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" - Winbatch_uninstall_help_de_msi - 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 - -comment "Cleanup registry" -Registry_uninstall /32Bit - -comment "Delete program shortcuts" -LinkFolder_uninstall - -[Winbatch_uninstall_help_de_msi_old] -msiexec /x $MsiIdOldHelpDe$ /qb! REBOOT=ReallySuppress - -[Winbatch_uninstall_msi_old] -msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress - -[Winbatch_uninstall_help_de_msi] -msiexec /x $MsiIdHelpDe$ /qb! REBOOT=ReallySuppress - -[Winbatch_uninstall_msi] -msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress - -[Files_uninstall] -; Example for recursively deleting the installation directory: -; -del -sf "$InstallDir$\" - -[Registry_uninstall] -; Example of deleting a registry key: -; -; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$] - -[LinkFolder_uninstall] -; Example of deleting a folder from AllUsers startmenu: -; -; set_basefolder common_programs -; delete_subfolder $ProductId$ -; -; Example of deleting a shortcut from AllUsers desktop: -; -; set_basefolder common_desktopdirectory -; set_subfolder "" -; delete_element $ProductId$ - -[Sub_check_exitcode] -comment "Test for installation success via exit code" -set $ExitCode$ = getLastExitCode -; informations to exit codes see -; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx -; http://msdn.microsoft.com/en-us/library/aa368542.aspx -if ($ExitCode$ = "0") - comment "Looks good: setup program gives exitcode zero" -else - comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ - if ($ExitCode$ = "1605") - 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" - else - if ($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." - else - if ($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." - else - logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ - isFatalError - endif - endif - endif -endif - diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins new file mode 100644 index 0000000..2bd45aa --- /dev/null +++ b/CLIENT_DATA/delsub3264.ins @@ -0,0 +1,170 @@ +; 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/ + + +Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" + +Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini" + +if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") + if FileExists($IniFile32$) + Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","") + endif + Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..." + if FileExists($IniFile32$) + Set $MsiIdOldHelpDe32$ = GetValueFromInifile($IniFile32$,"X86","MsiIdHelpDe32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOldHelpDe32$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old_help_de_32 + sub_check_exitcode + endif + Set $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old_32 + sub_check_exitcode + endif + endif + if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdHelpDe32$ + "] DisplayName") = "") + comment "MSI id " + $MsiId32HelpDe$ + " found in registry, starting msiexec to uninstall" + Winbatch_uninstall_msi_help_de_32 + sub_check_exitcode + endif + if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "") + comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall" + Winbatch_uninstall_msi_32 + sub_check_exitcode + endif + + comment "Delete files" + Files_uninstall_32 /32Bit + comment "Cleanup registry" + Registry_uninstall /32Bit +endif + +if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) + if FileExists($IniFile64$) + Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","") + endif + Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..." + + if FileExists($IniFile64$) + Set $MsiIdOldHelpDe64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiIdHelpDe64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOldHelpDe64$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOldHelpDe64$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old_help_de_64 + sub_check_exitcode + endif + Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") + if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "") + comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version" + Winbatch_uninstall_msi_old_64 + sub_check_exitcode + endif + endif + if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64HelpDe$ + "] DisplayName") = "") + comment "MSI id " + $MsiIdHelpDe64$ + " found in registry, starting msiexec to uninstall" + Winbatch_uninstall_msi_help_de_64 + sub_check_exitcode + endif + if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "") + comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall" + Winbatch_uninstall_msi_64 + sub_check_exitcode + endif + + comment "Delete files" + Files_uninstall_64 /64Bit + comment "Cleanup registry" + Registry_uninstall /64Bit +endif + +comment "Delete program shortcuts" +LinkFolder_uninstall + +[Winbatch_uninstall_msi_old_help_de_32] +msiexec /x $MsiIdOldHelpDe32$ /qb! REBOOT=ReallySuppress + +[Winbatch_uninstall_msi_old_32] +msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress + +[Winbatch_uninstall_msi_help_de_32] +msiexec /x $MsiIdHelpDe32$ /qb! REBOOT=ReallySuppress + +[Winbatch_uninstall_msi_32] +msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress + +[Files_uninstall_32] +; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; +delete -sf "$InstallDir32$\" + +[Winbatch_uninstall_msi_old_help_de_64] +msiexec /x $MsiIdOldHelpDe64$ /qb! REBOOT=ReallySuppress + +[Winbatch_uninstall_msi_old_64] +msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress + +[Winbatch_uninstall_msi_help_de_64] +msiexec /x $MsiIdHelpDe64$ /qb! REBOOT=ReallySuppress + +[Winbatch_uninstall_msi_64] +msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress + +[Files_uninstall_64] +; Example for recursively deleting the installation directory: +; +del -sf "$InstallDir64$\" + +[Registry_uninstall] +; Example of deleting a registry key: +; +; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$] + +[LinkFolder_uninstall] +; Example of deleting a folder from AllUsers startmenu: +; +; set_basefolder common_programs +; delete_subfolder $ProductId$ +; +; Example of deleting a shortcut from AllUsers desktop: +; +; set_basefolder common_desktopdirectory +; set_subfolder "" +; delete_element $ProductId$ + +[Sub_check_exitcode] +comment "Test for installation success via exit code" +set $ExitCode$ = getLastExitCode +; informations to exit codes see +; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx +; http://msdn.microsoft.com/en-us/library/aa368542.aspx +if ($ExitCode$ = "0") + comment "Looks good: setup program gives exitcode zero" +else + comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ + if ($ExitCode$ = "1605") + 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" + else + if ($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." + else + if ($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." + else + logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ + isFatalError + endif + endif + endif +endif + diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup3264.ins similarity index 58% rename from CLIENT_DATA/setup32.ins rename to CLIENT_DATA/setup3264.ins index 6755fca..79f4c47 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup3264.ins @@ -6,19 +6,26 @@ [Actions] requiredWinstVersion >= "4.11.2.6" -DefVar $MsiIdOld$ -DefVar $MsiIdOldHelpDe$ -DefVar $IniFile$ +DefVar $MsiIdOld32$ +DefVar $IniFile32$ +DefVar $MsiIdOld64$ +DefVar $IniFile64$ DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ -DefVar $InstallDir$ +DefVar $InstallDir32$ +DefVar $InstallDir64$ DefVar $ExitCode$ +DefVar $INST_SystemType$ +DefVar $INST_architecture$ DefVar $OLD_VERSION$ DefVar $OLD_CREATOR_TAG$ DefVar $OLD_RELEASE$ +Set $INST_SystemType$ = GetSystemType +set $INST_architecture$ = GetProductProperty("install_architecture","system specific") + Set $LogDir$ = "%SystemDrive%\tmp" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -39,57 +46,85 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; no white space use '-' as a seperator Set $MinimumSpace$ = "1500 MB" ; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice" +Set $InstallDir32$ = "%ProgramFiles32Dir%\LibreOffice" +Set $InstallDir64$ = "%ProgramFiles64Dir%\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 "No Space" + isFatalError ; Stop process and set installation status to failed else comment "Show product picture" ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ - if FileExists("%ScriptPath%\delsub32.ins") + if FileExists("%ScriptPath%\delsub3264.ins") comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub32.ins" + Sub "%ScriptPath%\delsub3264.ins" endif - Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." - - comment "Start setup program" - ChangeDirectory "%SCRIPTPATH%" - Winbatch_install - Sub_check_exitcode - Winbatch_install_help_de - Sub_check_exitcode - - comment "Copy files" - Files_install /32Bit - - comment "Patch Registry" - Registry_install /32Bit - - comment "Create shortcuts" - LinkFolder_install + comment "installing" + + if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." + comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" + Winbatch_install_32 + Sub_check_exitcode + Winbatch_install_help_de_32 + Sub_check_exitcode + comment "Copy files" + Files_install_32 /32Bit + comment "Patch Registry" + Registry_install /32Bit + comment "Create shortcuts" + LinkFolder_install + endif + + if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) + Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." + comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" + Winbatch_install_64 + Sub_check_exitcode + Winbatch_install_help_de_64 + Sub_check_exitcode + comment "Copy files" + Files_install_64 /64Bit + comment "Patch Registry" + Registry_install /64Bit + comment "Create shortcuts" + LinkFolder_install + endif endif -[Winbatch_install] -msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION="$InstallDir$" ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 UI_LANGS=en_US,de +[Winbatch_install_32] +msiexec /i "$InstallMsi32$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION="$InstallDir32$" ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 UI_LANGS=en_US,de -[Winbatch_install_help_de] -msiexec /i "$InstallHelpDeMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION="$InstallDir$" ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 UI_LANGS=en_US,de +[Winbatch_install_help_de_32] +msiexec /i "$InstallHelpDeMsi32$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION="$InstallDir32$" ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 UI_LANGS=en_US,de -[Files_install] +[Files_install_32] ; copy the ini file to the InstallDir -copy "$IniCfgFile$" "$InstallDir$" +copy "$IniCfgFile$" "$InstallDir32$" + + +[Winbatch_install_64] +msiexec /i "$InstallMsi64$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION="$InstallDir64$" ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 UI_LANGS=en_US,de + +[Winbatch_install_help_de_64] +msiexec /i "$InstallHelpDeMsi64$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress INSTALLLOCATION="$InstallDir64$" ISCHECKFORPRODUCTUPDATES=0 QUICKSTART=0 CREATEDESKTOPLINK=0 UI_LANGS=en_US,de + +[Files_install_64] +; copy the ini file to the InstallDir +copy "$IniCfgFile$" "$InstallDir64$" ; Example of recursively copying some files into the installation directory: ; -; copy -s "%ScriptPath%\files\*.*" "$InstallDir$" +; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$" [Registry_install] ; Example of setting some values of an registry key: diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall3264.ins similarity index 73% rename from CLIENT_DATA/uninstall32.ins rename to CLIENT_DATA/uninstall3264.ins index e4c93dc..122aaa0 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -6,18 +6,25 @@ [Actions] requiredWinstVersion >= "4.11.2.6" -DefVar $MsiIdOld$ -DefVar $MsiIdOldHelpDe$ -DefVar $IniFile$ +DefVar $MsiIdOld32$ +DefVar $IniFile32$ +DefVar $MsiIdOld64$ +DefVar $IniFile64$ DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ -DefVar $InstallDir$ +DefVar $InstallDir32$ +DefVar $InstallDir64$ +DefVar $INST_SystemType$ +DefVar $INST_architecture$ DefVar $OLD_VERSION$ DefVar $OLD_CREATOR_TAG$ DefVar $OLD_RELEASE$ +Set $INST_SystemType$ = GetSystemType +set $INST_architecture$ = GetProductProperty("install_architecture","system specific") + Set $LogDir$ = "%SystemDrive%\tmp" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -33,7 +40,8 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice" +Set $InstallDir32$ = "%ProgramFiles32Dir%\LibreOffice" +Set $InstallDir64$ = "%ProgramFiles64Dir%\LibreOffice" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -43,8 +51,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." -if FileExists("%ScriptPath%\delsub32.ins") +if FileExists("%ScriptPath%\delsub3264.ins") comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub32.ins" + Sub "%ScriptPath%\delsub3264.ins" endif diff --git a/LibreOffice_5.2.0_Win_x64.msi.sha1sum b/LibreOffice_5.2.0_Win_x64.msi.sha1sum new file mode 100644 index 0000000..56e0c7d --- /dev/null +++ b/LibreOffice_5.2.0_Win_x64.msi.sha1sum @@ -0,0 +1 @@ +1b399875089329250f5dd27b89b364a864c9b555 /home/mario/.opsi-dist-cache/documentfoundation.libreoffice-5.2.0/X86_64/LibreOffice_5.2.0_Win_x64.msi diff --git a/LibreOffice_5.2.0_Win_x64_helppack_de.msi.sha1sum b/LibreOffice_5.2.0_Win_x64_helppack_de.msi.sha1sum new file mode 100644 index 0000000..6017782 --- /dev/null +++ b/LibreOffice_5.2.0_Win_x64_helppack_de.msi.sha1sum @@ -0,0 +1 @@ +9a09ba4fea955b2e7198eb889f41c6b33d31bfa4 /home/mario/.opsi-dist-cache/documentfoundation.libreoffice-5.2.0/X86_64/LibreOffice_5.2.0_Win_x64_helppack_de.msi diff --git a/OPSI/control b/OPSI/control index cf344aa..d3f60e3 100644 --- a/OPSI/control +++ b/OPSI/control @@ -1,25 +1,34 @@ [Package] -version: RELEASE +version: 2 depends: incremental: False [Product] type: localboot -id: documentfoundation.libreoffice -name: LibreOffice Productivity Suite -description: LibreOffice ist eine leistungsfaehige Office-Suite, voll kompatibel mit den Programmen anderer grosser Office-Anbieter ist. -advice: ADVICE -version: VERSION -priority: PRIORITY +id: opsi-template +name: opsi template product +description: A template for opsi products +advice: +version: 4.0.2 +priority: 0 licenseRequired: False productClasses: -setupScript: setup32.ins -uninstallScript: uninstall32.ins +setupScript: setup3264.ins +uninstallScript: uninstall3264.ins updateScript: alwaysScript: onceScript: customScript: -userLoginScript: +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 @@ -27,3 +36,4 @@ requiredProduct: sereby.aio requiredStatus: installed requirementType: before + diff --git a/builder-product.cfg b/builder-product.cfg index d0b2683..f21e4ea 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -14,7 +14,6 @@ ADVICE="" # Valid value: restricted | public TYPE="public" - DL_FILE[0]="libo-logo.png" DL_SOURCE[0]="http://www.cb-computerservice.at/bilder/libo-logo.png" @@ -23,22 +22,45 @@ DL_FILE[1]="LibreOffice_${VERSION}_Win_x86.msi" DL_SOURCE[1]="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/win/x86/LibreOffice_${VERSION}_Win_x86.msi.torrent" DL_DOWNLOADER[1]="aria2c" DL_ARCH[1]="X86" -DL_WINST_NAME[1]=InstallMsi +DL_WINST_NAME[1]=InstallMsi32 DL_FILE[2]="LibreOffice_${VERSION}_Win_x86_helppack_de.msi" #DL_SOURCE[2]="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/win/x86/LibreOffice_${VERSION}_Win_x86_helppack_de.msi" DL_SOURCE[2]="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/win/x86/LibreOffice_${VERSION}_Win_x86_helppack_de.msi.torrent" DL_DOWNLOADER[2]="aria2c" DL_ARCH[2]="X86" -DL_WINST_NAME[2]=InstallHelpDeMsi +DL_WINST_NAME[2]=InstallHelpDeMsi32 + +DL_FILE[3]="LibreOffice_${VERSION}_Win_x64.msi" +#DL_SOURCE[3]="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/win/x86_64/LibreOffice_${VERSION}_Win_x64.msi" +DL_SOURCE[3]="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/win/x86_64/LibreOffice_${VERSION}_Win_x64.msi.torrent" +DL_DOWNLOADER[3]="aria2c" +DL_ARCH[3]="X86_64" +DL_WINST_NAME[3]=InstallMsi64 + +DL_FILE[4]="LibreOffice_${VERSION}_Win_x64_helppack_de.msi" +#DL_SOURCE[4]="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/win/x86_64/LibreOffice_${VERSION}_Win_x64_helppack_de.msi" +DL_SOURCE[4]="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/win/x86_64/LibreOffice_${VERSION}_Win_x64_helppack_de.msi.torrent" +DL_DOWNLOADER[4]="aria2c" +DL_ARCH[4]="X86_64" +DL_WINST_NAME[4]=InstallHelpDeMsi64 # File array index for the image showing while installing the program ICON_DL_INDEX=0 OPSI_INI_SECTION[0]="X86" -OPSI_INI_OPTION[0]="MsiId" +OPSI_INI_OPTION[0]="MsiId32" OPSI_INI_VALUE[0]="{8FA59B7B-1D26-408F-A798-BD11A65A68B9}" OPSI_INI_SECTION[1]="X86" -OPSI_INI_OPTION[1]="MsiIdHelpDe" +OPSI_INI_OPTION[1]="MsiIdHelpDe32" OPSI_INI_VALUE[1]="{9E24A391-7566-4A92-A5AD-4280264AB2F1}" + +OPSI_INI_SECTION[2]="X86_64" +OPSI_INI_OPTION[2]="MsiId64" +OPSI_INI_VALUE[2]="{8FA59B7B-1D26-408F-A798-BD11A65A68B9}" + +OPSI_INI_SECTION[3]="X86_64" +OPSI_INI_OPTION[3]="MsiIdHelpDe64" +OPSI_INI_VALUE[3]="{9E24A391-7566-4A92-A5AD-4280264AB2F1}" +