This commit is contained in:
Mario Fetka 2017-10-30 14:09:23 +01:00
parent 605eab69b8
commit 1499e2d28c
7 changed files with 17 additions and 17 deletions

View File

@ -15,23 +15,23 @@ Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR
if FileExists($IniFile$) if FileExists($IniFile$)
Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "") if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "")
comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version"
Winbatch_uninstall_msi_old Winbatch_uninstall_msi_old
sub_check_exitcode sub_check_exitcode
endif endif
endif endif
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "")
comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi Winbatch_uninstall_msi
sub_check_exitcode sub_check_exitcode
endif endif
comment "Delete files" comment "Delete files"
Files_uninstall /32Bit Files_uninstall /64Bit
comment "Cleanup registry" comment "Cleanup registry"
Registry_uninstall /32Bit Registry_uninstall /64Bit
comment "Delete program shortcuts" comment "Delete program shortcuts"
LinkFolder_uninstall LinkFolder_uninstall

View File

@ -38,7 +38,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; no white space use '-' as a seperator ; no white space use '-' as a seperator
Set $MinimumSpace$ = "50 MB" Set $MinimumSpace$ = "50 MB"
; the path were we find the product after the installation ; the path were we find the product after the installation
Set $InstallDir$ = "%ProgramFiles32Dir%\MySQL\Workbench" Set $InstallDir$ = "%ProgramFiles64Dir%\MySQL\Workbench"
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@ -51,9 +51,9 @@ else
comment "Show product picture" comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
if FileExists("%ScriptPath%\delsub32.ins") if FileExists("%ScriptPath%\delsub64.ins")
comment "Start uninstall sub section" comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub32.ins" Sub "%ScriptPath%\delsub64.ins"
endif endif
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
@ -64,10 +64,10 @@ else
Sub_check_exitcode Sub_check_exitcode
comment "Copy files" comment "Copy files"
Files_install /32Bit Files_install /64Bit
comment "Patch Registry" comment "Patch Registry"
Registry_install /32Bit Registry_install /64Bit
comment "Create shortcuts" comment "Create shortcuts"
LinkFolder_install LinkFolder_install

View File

@ -32,7 +32,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
; - Please edit the following values - ; - Please edit the following values -
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
Set $InstallDir$ = "%ProgramFiles32Dir%\MySQL\Workbench" Set $InstallDir$ = "%ProgramFiles64Dir%\MySQL\Workbench"
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@ -42,8 +42,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
Message "Uninstalling " + $ProductId$ + " ..." Message "Uninstalling " + $ProductId$ + " ..."
if FileExists("%ScriptPath%\delsub32.ins") if FileExists("%ScriptPath%\delsub64.ins")
comment "Start uninstall sub section" comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub32.ins" Sub "%ScriptPath%\delsub64.ins"
endif endif

View File

@ -13,8 +13,8 @@ version: 4.0.2
priority: 0 priority: 0
licenseRequired: False licenseRequired: False
productClasses: productClasses:
setupScript: setup32.ins setupScript: setup64.ins
uninstallScript: uninstall32.ins uninstallScript: uninstall64.ins
updateScript: updateScript:
alwaysScript: alwaysScript:
onceScript: onceScript:

View File

@ -20,8 +20,8 @@ ICON_DL_INDEX=0
DL_FILE[0]="mysqlworkbench-icon.png" DL_FILE[0]="mysqlworkbench-icon.png"
DL_SOURCE[0]="http://macin.files.wordpress.com/2009/09/mysqlworkbench-icon.png" DL_SOURCE[0]="http://macin.files.wordpress.com/2009/09/mysqlworkbench-icon.png"
DL_FILE[1]="mysql-workbench-gpl-${VERSION}-win32.msi" DL_FILE[1]="mysql-workbench-community-${VERSION}-winx64.msi"
DL_SOURCE[1]="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${VERSION}-winx64.msi" DL_SOURCE[1]="https://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${VERSION}-winx64.msi"
DL_ARCH[1]="X86" DL_ARCH[1]="X86"
DL_WINST_NAME[1]=InstallMsi DL_WINST_NAME[1]=InstallMsi

View File

@ -0,0 +1 @@
a09433208594db90fad4bbcb50c365bfaa3be795 /home/mario/.opsi-dist-cache/mysql.workbench-6.3.9/X86/mysql-workbench-community-6.3.9-winx64.msi

View File

@ -1 +0,0 @@
a09433208594db90fad4bbcb50c365bfaa3be795 /home/mario/.opsi-dist-cache/mysql.workbench-6.3.9/X86/mysql-workbench-gpl-6.3.9-win32.msi