summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Fetka <[email protected]>2017-10-30 13:09:23 (GMT)
committer Mario Fetka <[email protected]>2017-10-30 13:09:23 (GMT)
commit1499e2d28ccb75287c5ee8ff7d784245ce27af56 (patch)
tree0afc62d9de0011658ebb856fa3bef056609fd072
parent605eab69b8a45519871091c533c98da86a4fa3f2 (diff)
Bump
-rw-r--r--CLIENT_DATA/delsub64.ins (renamed from CLIENT_DATA/delsub32.ins)8
-rw-r--r--CLIENT_DATA/setup64.ins (renamed from CLIENT_DATA/setup32.ins)10
-rw-r--r--CLIENT_DATA/uninstall64.ins (renamed from CLIENT_DATA/uninstall32.ins)6
-rw-r--r--OPSI/control4
-rw-r--r--builder-product.cfg4
-rw-r--r--mysql-workbench-community-6.3.9-winx64.msi.sha1sum1
-rw-r--r--mysql-workbench-gpl-6.3.9-win32.msi.sha1sum1
7 files changed, 17 insertions, 17 deletions
diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub64.ins
index 6f1e92a..a5684ca 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub64.ins
@@ -15,23 +15,23 @@ Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR
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") = "")
+ 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"
Winbatch_uninstall_msi_old
sub_check_exitcode
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"
Winbatch_uninstall_msi
sub_check_exitcode
endif
comment "Delete files"
-Files_uninstall /32Bit
+Files_uninstall /64Bit
comment "Cleanup registry"
-Registry_uninstall /32Bit
+Registry_uninstall /64Bit
comment "Delete program shortcuts"
LinkFolder_uninstall
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup64.ins
index 19a5239..b5300b6 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup64.ins
@@ -38,7 +38,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; no white space use '-' as a seperator
Set $MinimumSpace$ = "50 MB"
; 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"
@@ -51,9 +51,9 @@ else
comment "Show product picture"
ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
- if FileExists("%ScriptPath%\delsub32.ins")
+ if FileExists("%ScriptPath%\delsub64.ins")
comment "Start uninstall sub section"
- Sub "%ScriptPath%\delsub32.ins"
+ Sub "%ScriptPath%\delsub64.ins"
endif
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
@@ -64,10 +64,10 @@ else
Sub_check_exitcode
comment "Copy files"
- Files_install /32Bit
+ Files_install /64Bit
comment "Patch Registry"
- Registry_install /32Bit
+ Registry_install /64Bit
comment "Create shortcuts"
LinkFolder_install
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall64.ins
index 0569d56..f08e624 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall64.ins
@@ -32,7 +32,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; ----------------------------------------------------------------
; - Please edit the following values -
; ----------------------------------------------------------------
-Set $InstallDir$ = "%ProgramFiles32Dir%\MySQL\Workbench"
+Set $InstallDir$ = "%ProgramFiles64Dir%\MySQL\Workbench"
; ----------------------------------------------------------------
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -42,8 +42,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
Message "Uninstalling " + $ProductId$ + " ..."
-if FileExists("%ScriptPath%\delsub32.ins")
+if FileExists("%ScriptPath%\delsub64.ins")
comment "Start uninstall sub section"
- Sub "%ScriptPath%\delsub32.ins"
+ Sub "%ScriptPath%\delsub64.ins"
endif
diff --git a/OPSI/control b/OPSI/control
index 48b5f43..847dbe0 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -13,8 +13,8 @@ version: 4.0.2
priority: 0
licenseRequired: False
productClasses:
-setupScript: setup32.ins
-uninstallScript: uninstall32.ins
+setupScript: setup64.ins
+uninstallScript: uninstall64.ins
updateScript:
alwaysScript:
onceScript:
diff --git a/builder-product.cfg b/builder-product.cfg
index bffbdcb..9cccd98 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -20,8 +20,8 @@ ICON_DL_INDEX=0
DL_FILE[0]="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_SOURCE[1]="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${VERSION}-winx64.msi"
+DL_FILE[1]="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_WINST_NAME[1]=InstallMsi
diff --git a/mysql-workbench-community-6.3.9-winx64.msi.sha1sum b/mysql-workbench-community-6.3.9-winx64.msi.sha1sum
new file mode 100644
index 0000000..257f843
--- /dev/null
+++ b/mysql-workbench-community-6.3.9-winx64.msi.sha1sum
@@ -0,0 +1 @@
+a09433208594db90fad4bbcb50c365bfaa3be795 /home/mario/.opsi-dist-cache/mysql.workbench-6.3.9/X86/mysql-workbench-community-6.3.9-winx64.msi
diff --git a/mysql-workbench-gpl-6.3.9-win32.msi.sha1sum b/mysql-workbench-gpl-6.3.9-win32.msi.sha1sum
deleted file mode 100644
index 29ee6d0..0000000
--- a/mysql-workbench-gpl-6.3.9-win32.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-a09433208594db90fad4bbcb50c365bfaa3be795 /home/mario/.opsi-dist-cache/mysql.workbench-6.3.9/X86/mysql-workbench-gpl-6.3.9-win32.msi

Powered by Domaintechnik.at | Hosting - Domain - Webspace