From de082d43f3128606db2d905bb90386e6365c068f Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 19 Sep 2019 14:11:18 +0200 Subject: [PATCH] Bump and redesigne to 32/64 bit package --- CLIENT_DATA/delsub32.ins | 95 ------------ CLIENT_DATA/delsub3264.ins | 137 ++++++++++++++++++ CLIENT_DATA/opsi-google.earth.ini | 5 +- CLIENT_DATA/{setup32.ins => setup3264.ins} | 92 ++++++++---- .../{uninstall32.ins => uninstall3264.ins} | 21 ++- GoogleEarthWin-7.1.5.1557.exe.sha1sum | 1 - OPSI/control | 22 +-- builder-product.cfg | 28 +++- googleearthprowin-7.3.2.5776-x32.exe.sha1sum | 1 + googleearthprowin-7.3.2.5776-x64.exe.sha1sum | 1 + 10 files changed, 251 insertions(+), 152 deletions(-) delete mode 100644 CLIENT_DATA/delsub32.ins create mode 100644 CLIENT_DATA/delsub3264.ins rename CLIENT_DATA/{setup32.ins => setup3264.ins} (67%) rename CLIENT_DATA/{uninstall32.ins => uninstall3264.ins} (72%) delete mode 100644 GoogleEarthWin-7.1.5.1557.exe.sha1sum create mode 100644 googleearthprowin-7.3.2.5776-x32.exe.sha1sum create mode 100644 googleearthprowin-7.3.2.5776-x64.exe.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins deleted file mode 100644 index 6f1e92a..0000000 --- a/CLIENT_DATA/delsub32.ins +++ /dev/null @@ -1,95 +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 $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\" + $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_msi_old] -msiexec /x $MsiIdOld$ /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..c0fdcce --- /dev/null +++ b/CLIENT_DATA/delsub3264.ins @@ -0,0 +1,137 @@ +; 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 $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\" + $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 $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\" + $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_32] +msiexec /x $MsiIdOld32$ /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_64] +msiexec /x $MsiIdOld64$ /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/opsi-google.earth.ini b/CLIENT_DATA/opsi-google.earth.ini index 1050a11..a4095d5 100644 --- a/CLIENT_DATA/opsi-google.earth.ini +++ b/CLIENT_DATA/opsi-google.earth.ini @@ -1,5 +1,8 @@ [X86] -MsiId={468D22C0-8080-11E2-B86E-B8AC6F98CCE3} +MsiId32={468D22C0-8080-11E2-B86E-B8AC6F98CCE3} + +[X86_64] +MsiId64={468D22C0-8080-11E2-B86E-B8AC6F98CCE3} [COMMON] PN=google.earth diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup3264.ins similarity index 67% rename from CLIENT_DATA/setup32.ins rename to CLIENT_DATA/setup3264.ins index 1a01669..5b81dad 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup3264.ins @@ -6,18 +6,26 @@ [Actions] requiredWinstVersion >= "4.11.2.6" -DefVar $MsiIdOld$ -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 @@ -38,52 +46,78 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; no white space use '-' as a seperator Set $MinimumSpace$ = "500 MB" ; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles32Dir%\Google\Google Earth" +Set $InstallDir32$ = "%ProgramFiles32Dir%\Google\Google Earth Pro" +Set $InstallDir64$ = "%ProgramFiles64Dir%\Google\Google Earth Pro" ; ---------------------------------------------------------------- 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 - - 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 + 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 + 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 +[Winbatch_install_32] +"$Install32Exe$" OMAHA=1 -[Files_install] +[Files_install_32] ; copy the ini file to the InstallDir -copy "$IniCfgFile$" "$InstallDir$" +copy "$IniCfgFile$" "$InstallDir32$" ; Example of recursively copying some files into the installation directory: ; -; copy -s "%ScriptPath%\files\*.*" "$InstallDir$" +; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" + +[Winbatch_install_64] +"$Install64Exe$" OMAHA=1 + +[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\*.*" "$InstallDir64$" [Registry_install] ; Example of setting some values of an registry key: @@ -130,10 +164,6 @@ delete_element "Google Earth" ; icon_file: ; icon_index: 2 ; end_link -;set_basefolder common_desktopdirectory -;set_subfolder "" -;delete_element Google Earth - [Sub_check_exitcode] comment "Test for installation success via exit code" diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall3264.ins similarity index 72% rename from CLIENT_DATA/uninstall32.ins rename to CLIENT_DATA/uninstall3264.ins index b3eae9a..9d1fe5a 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -6,17 +6,25 @@ [Actions] requiredWinstVersion >= "4.11.2.6" -DefVar $MsiIdOld$ -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 @@ -32,7 +40,8 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $InstallDir$ = "%ProgramFiles32Dir%\Google\Google Earth" +Set $InstallDir32$ = "%ProgramFiles32Dir%\Google\Google Earth Pro" +Set $InstallDir64$ = "%ProgramFiles64Dir%\Google\Google Earth Pro" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -42,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/GoogleEarthWin-7.1.5.1557.exe.sha1sum b/GoogleEarthWin-7.1.5.1557.exe.sha1sum deleted file mode 100644 index 317f50b..0000000 --- a/GoogleEarthWin-7.1.5.1557.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -9758c0906df97b25ebd5c390553ca7e4f4d71d28 /home/mario/.opsi-dist-cache/google.earth-7.1.5.1557/X86/GoogleEarthWin-7.1.5.1557.exe diff --git a/OPSI/control b/OPSI/control index 4a83455..d3f60e3 100644 --- a/OPSI/control +++ b/OPSI/control @@ -1,25 +1,25 @@ [Package] -version: RELEASE +version: 2 depends: incremental: False [Product] type: localboot -id: google.earth -name: google.earth -description: Google Earth -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 @@ -35,3 +35,5 @@ action: setup requiredProduct: sereby.aio requiredStatus: installed requirementType: before + + diff --git a/builder-product.cfg b/builder-product.cfg index e902688..5dbbed7 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="google.com" PN="google.earth" NAME="Google Earth" DESCRIPTION="Google Earth ist eine in der Grundform unentgeltliche Software der Google Inc. und stellt einen virtuellen Globus dar." -VERSION="7.1.5.1557" +VERSION="7.3.2.5776" RELEASE="1" PRIORITY="0" ADVICE="" @@ -18,12 +18,20 @@ TYPE="public" DL_FILE[0]="google_earth_logo_png_ai_by_ockre-d3gttvo.jpg" DL_SOURCE[0]="http://img02.deviantart.net/b7b9/i/2011/140/a/e/google_earth_logo_png_ai_by_ockre-d3gttvo.jpg" -DL_FILE[1]="GoogleEarthWin-${VERSION}.exe" -#DL_SOURCE[1]="http://dl.google.com/dl/earth/client/advanced/current/googleearthprowin.exe" -#DL_SOURCE[1]="http://dl.google.com/earth/client/current/GoogleEarthWin.exe" -DL_SOURCE[1]="http://ftp.disconnected-by-peer.at/Repack/Google/Earth/GoogleEarthWin-${VERSION}.exe" +# replace points, split into array +a=( ${VERSION//./ } ) + +DL_FILE[1]="googleearthprowin-${VERSION}-x32.exe" +#DL_SOURCE[1]="http://ftp.disconnected-by-peer.at/Repack/Google/Earth/GoogleEarthWin-${VERSION}.exe" +DL_SOURCE[1]="https://dl.google.com/dl/earth/client/advanced/current/googleearthprowin-${a[0]}.${a[1]}.${a[2]}.exe" DL_ARCH[1]="X86" -DL_EXTRACT_FORMAT[1]="7zip" +DL_WINST_NAME[1]=Install32Exe + +DL_FILE[2]="googleearthprowin-${VERSION}-x64.exe" +DL_SOURCE[2]="https://dl.google.com/dl/earth/client/advanced/current/googleearthprowin-${a[0]}.${a[1]}.${a[2]}-x64.exe" +DL_ARCH[2]="X86_64" +DL_WINST_NAME[2]=Install64Exe + # File array index for the image showing while installing the program ICON_DL_INDEX=0 @@ -32,5 +40,9 @@ WINST_NAME[0]="InstallMsi" WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\Google Earth.msi" OPSI_INI_SECTION[0]="X86" -OPSI_INI_OPTION[0]="MsiId" -OPSI_INI_VALUE[0]="{817750FA-EC6A-485D-9901-0683AE6FFDF1}" \ No newline at end of file +OPSI_INI_OPTION[0]="MsiId32" +OPSI_INI_VALUE[0]="{9D524A1E-F2FC-444D-B12A-7592CEB56EB5}" + +OPSI_INI_SECTION[1]="X86_64" +OPSI_INI_OPTION[1]="MsiId64" +OPSI_INI_VALUE[1]="{70A0F34E-564B-4F93-ADD6-3BAEC6E44075}" diff --git a/googleearthprowin-7.3.2.5776-x32.exe.sha1sum b/googleearthprowin-7.3.2.5776-x32.exe.sha1sum new file mode 100644 index 0000000..a03b460 --- /dev/null +++ b/googleearthprowin-7.3.2.5776-x32.exe.sha1sum @@ -0,0 +1 @@ +f0021a63c9f8a2370e108bb4bc6e8fdd2e5f2fd4 /home/mario/.opsi-dist-cache/google.earth-7.3.2.5776/X86/googleearthprowin-7.3.2.5776-x32.exe diff --git a/googleearthprowin-7.3.2.5776-x64.exe.sha1sum b/googleearthprowin-7.3.2.5776-x64.exe.sha1sum new file mode 100644 index 0000000..5b5de07 --- /dev/null +++ b/googleearthprowin-7.3.2.5776-x64.exe.sha1sum @@ -0,0 +1 @@ +b3cf275eb3ad5b90401dbf403e1a1c71bad0c6cd /home/mario/.opsi-dist-cache/google.earth-7.3.2.5776/X86_64/googleearthprowin-7.3.2.5776-x64.exe