From 3791703fb4f207d8e380d835b9257ece89e427bb Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 13 Apr 2013 18:52:07 +0200 Subject: [PATCH] Only 32bit is working at the moent so switch to 32bit also on 64bit --- CLIENT_DATA/config3264.ins | 58 +++++++++++++++++------------------ CLIENT_DATA/define3264.inc | 2 +- CLIENT_DATA/setup3264.ins | 4 +-- CLIENT_DATA/uninstall3264.ins | 2 +- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins index 59e462e..187c502 100644 --- a/CLIENT_DATA/config3264.ins +++ b/CLIENT_DATA/config3264.ins @@ -93,91 +93,91 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe Message "Configuring " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." comment "Patch Registry" if ($server_extraports_set$ = "1") - Registry_server_extraports_value_of /64Bit + Registry_server_extraports_value_of /32Bit endif if ($server_querytimeout_set$ = "1") - Registry_server_querytimeout_value_of /64Bit + Registry_server_querytimeout_value_of /32Bit endif if ($server_queryacceptontimeout_set$ = "1") - Registry_server_queryacceptontimeout_value_of /64Bit + Registry_server_queryacceptontimeout_value_of /32Bit endif if ($server_localinputprioritytimeout_set$ = "1") - Registry_server_localinputprioritytimeout_value_of /64Bit + Registry_server_localinputprioritytimeout_value_of /32Bit endif if ($server_localinputpriority_set$ = "1") - Registry_server_localinputpriority_value_of /64Bit + Registry_server_localinputpriority_value_of /32Bit endif if ($server_blockremoteinput_set$ = "1") - Registry_server_blockremoteinput_value_of /64Bit + Registry_server_blockremoteinput_value_of /32Bit endif if ($server_blocklocalinput_set$ = "1") - Registry_server_blocklocalinput_value_of /64Bit + Registry_server_blocklocalinput_value_of /32Bit endif if ($server_ipaccesscontrol_set$ = "1") - Registry_server_ipaccesscontrol_value_of /64Bit + Registry_server_ipaccesscontrol_value_of /32Bit endif if ($server_rfbport_set$ = "1") - Registry_server_rfbport_value_of /64Bit + Registry_server_rfbport_value_of /32Bit endif if ($server_httpport_set$ = "1") - Registry_server_httpport_value_of /64Bit + Registry_server_httpport_value_of /32Bit endif if ($server_disconnectaction_set$ = "1") - Registry_server_disconnectaction_value_of /64Bit + Registry_server_disconnectaction_value_of /32Bit endif if ($server_acceptrfbconnections_set$ = "1") - Registry_server_acceptrfbconnections_value_of /64Bit + Registry_server_acceptrfbconnections_value_of /32Bit endif if ($server_usevncauthentication_set$ = "1") - Registry_server_usevncauthentication_value_of /64Bit + Registry_server_usevncauthentication_value_of /32Bit endif if ($server_usecontrolauthentication_set$ = "1") - Registry_server_usecontrolauthentication_value_of /64Bit + Registry_server_usecontrolauthentication_value_of /32Bit endif if ($server_loopbackonly_set$ = "1") - Registry_server_loopbackonly_value_of /64Bit + Registry_server_loopbackonly_value_of /32Bit endif if ($server_accepthttpconnections_set$ = "1") - Registry_server_accepthttpconnections_value_of /64Bit + Registry_server_accepthttpconnections_value_of /32Bit endif if ($server_loglevel_set$ = "1") - Registry_server_loglevel_value_of /64Bit + Registry_server_loglevel_value_of /32Bit endif if ($server_enablefiletransfers_set$ = "1") - Registry_server_enablefiletransfers_value_of /64Bit + Registry_server_enablefiletransfers_value_of /32Bit endif if ($server_removewallpaper_set$ = "1") - Registry_server_removewallpaper_value_of /64Bit + Registry_server_removewallpaper_value_of /32Bit endif if ($server_usemirrordriver_set$ = "1") - Registry_server_usemirrordriver_value_of /64Bit + Registry_server_usemirrordriver_value_of /32Bit endif if ($server_enableurlparams_set$ = "1") - Registry_server_enableurlparams_value_of /64Bit + Registry_server_enableurlparams_value_of /32Bit endif if ($server_alwaysshared_set$ = "1") - Registry_server_alwaysshared_value_of /64Bit + Registry_server_alwaysshared_value_of /32Bit endif if ($server_nevershared_set$ = "1") - Registry_server_nevershared_value_of /64Bit + Registry_server_nevershared_value_of /32Bit endif if ($server_disconnectclients_set$ = "1") - Registry_server_disconnectclients_value_of /64Bit + Registry_server_disconnectclients_value_of /32Bit endif if ($server_pollinginterval_set$ = "1") - Registry_server_pollinginterval_value_of /64Bit + Registry_server_pollinginterval_value_of /32Bit endif if ($server_allowloopback_set$ = "1") - Registry_server_allowloopback_value_of /64Bit + Registry_server_allowloopback_value_of /32Bit endif if ($server_grabtransparentwindows_set$ = "1") - Registry_server_grabtransparentwindows_value_of /64Bit + Registry_server_grabtransparentwindows_value_of /32Bit endif if ($server_savelogtoalluserspath_set$ = "1") - Registry_server_savelogtoalluserspath_value_of /64Bit + Registry_server_savelogtoalluserspath_value_of /32Bit endif if ($server_runcontrolinterface_set$ = "1") - Registry_server_runcontrolinterface_value_of /64Bit + Registry_server_runcontrolinterface_value_of /32Bit endif endif diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc index e23e585..dccfc9f 100644 --- a/CLIENT_DATA/define3264.inc +++ b/CLIENT_DATA/define3264.inc @@ -135,4 +135,4 @@ Set $server_password_value_of$ = GetProductProperty("server_password_value_o DefVar $server_viewonlypassword_set$ Set $server_viewonlypassword_set$ = GetProductProperty("server_viewonlypassword_set", "0") DefVar $server_viewonlypassword_value_of$ -Set $server_viewonlypassword_value_of$ = GetProductProperty("server_viewonlypassword_value_of", "") \ No newline at end of file +Set $server_viewonlypassword_value_of$ = GetProductProperty("server_viewonlypassword_value_of", "") diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 391b983..1742844 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -49,7 +49,7 @@ include_insert "define3264.inc" Set $MinimumSpace$ = "1 MB" ; the path were we find the product after the installation Set $InstallDir32$ = "%ProgramFiles32Dir%\TightVNC" -Set $InstallDir64$ = "%ProgramFiles64Dir%\TightVNC" +Set $InstallDir64$ = "%ProgramFiles32Dir%\TightVNC" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -124,7 +124,7 @@ copy "$IniCfgFile$" "$InstallDir32$" ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" [Winbatch_install_64] -msiexec /i "$Install64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress ADDLOCAL=Server SERVER_REGISTER_AS_SERVICE=$server_register_as_service$ SERVER_ADD_FIREWALL_EXCEPTION=$server_add_firewall_exception$ SERVER_ALLOW_SAS=$server_allow_sas$ SET_CONTROLPASSWORD=$server_controlpassword_set$ VALUE_OF_CONTROLPASSWORD=$server_controlpassword_value_of$ SET_PASSWORD=$server_password_set$ VALUE_OF_PASSWORD=$server_password_value_of$ SET_VIEWONLYPASSWORD=$server_viewonlypassword_set$ VALUE_OF_VIEWONLYPASSWORD=$server_viewonlypassword_value_of$ +msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress ADDLOCAL=Server SERVER_REGISTER_AS_SERVICE=$server_register_as_service$ SERVER_ADD_FIREWALL_EXCEPTION=$server_add_firewall_exception$ SERVER_ALLOW_SAS=$server_allow_sas$ SET_CONTROLPASSWORD=$server_controlpassword_set$ VALUE_OF_CONTROLPASSWORD=$server_controlpassword_value_of$ SET_PASSWORD=$server_password_set$ VALUE_OF_PASSWORD=$server_password_value_of$ SET_VIEWONLYPASSWORD=$server_viewonlypassword_set$ VALUE_OF_VIEWONLYPASSWORD=$server_viewonlypassword_value_of$ "$InstallExe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES [Files_install_64] diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index e6e334b..ec799c5 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -43,7 +43,7 @@ include_insert "define3264.inc" ; - Please edit the following values - ; ---------------------------------------------------------------- Set $InstallDir32$ = "%ProgramFiles32Dir%\TightVNC" -Set $InstallDir64$ = "%ProgramFiles64Dir%\TightVNC" +Set $InstallDir64$ = "%ProgramFiles32Dir%\TightVNC" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"