Updated version and some modification for better workflow

This commit is contained in:
Peter Singer 2013-05-12 16:48:21 +02:00
parent b85ee3ddbd
commit 1a1bcae6fc
9 changed files with 80 additions and 44 deletions

View File

@ -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 /32Bit
Registry_server_extraports_value_of /64Bit
endif
if ($server_querytimeout_set$ = "1")
Registry_server_querytimeout_value_of /32Bit
Registry_server_querytimeout_value_of /64Bit
endif
if ($server_queryacceptontimeout_set$ = "1")
Registry_server_queryacceptontimeout_value_of /32Bit
Registry_server_queryacceptontimeout_value_of /64Bit
endif
if ($server_localinputprioritytimeout_set$ = "1")
Registry_server_localinputprioritytimeout_value_of /32Bit
Registry_server_localinputprioritytimeout_value_of /64Bit
endif
if ($server_localinputpriority_set$ = "1")
Registry_server_localinputpriority_value_of /32Bit
Registry_server_localinputpriority_value_of /64Bit
endif
if ($server_blockremoteinput_set$ = "1")
Registry_server_blockremoteinput_value_of /32Bit
Registry_server_blockremoteinput_value_of /64Bit
endif
if ($server_blocklocalinput_set$ = "1")
Registry_server_blocklocalinput_value_of /32Bit
Registry_server_blocklocalinput_value_of /64Bit
endif
if ($server_ipaccesscontrol_set$ = "1")
Registry_server_ipaccesscontrol_value_of /32Bit
Registry_server_ipaccesscontrol_value_of /64Bit
endif
if ($server_rfbport_set$ = "1")
Registry_server_rfbport_value_of /32Bit
Registry_server_rfbport_value_of /64Bit
endif
if ($server_httpport_set$ = "1")
Registry_server_httpport_value_of /32Bit
Registry_server_httpport_value_of /64Bit
endif
if ($server_disconnectaction_set$ = "1")
Registry_server_disconnectaction_value_of /32Bit
Registry_server_disconnectaction_value_of /64Bit
endif
if ($server_acceptrfbconnections_set$ = "1")
Registry_server_acceptrfbconnections_value_of /32Bit
Registry_server_acceptrfbconnections_value_of /64Bit
endif
if ($server_usevncauthentication_set$ = "1")
Registry_server_usevncauthentication_value_of /32Bit
Registry_server_usevncauthentication_value_of /64Bit
endif
if ($server_usecontrolauthentication_set$ = "1")
Registry_server_usecontrolauthentication_value_of /32Bit
Registry_server_usecontrolauthentication_value_of /64Bit
endif
if ($server_loopbackonly_set$ = "1")
Registry_server_loopbackonly_value_of /32Bit
Registry_server_loopbackonly_value_of /64Bit
endif
if ($server_accepthttpconnections_set$ = "1")
Registry_server_accepthttpconnections_value_of /32Bit
Registry_server_accepthttpconnections_value_of /64Bit
endif
if ($server_loglevel_set$ = "1")
Registry_server_loglevel_value_of /32Bit
Registry_server_loglevel_value_of /64Bit
endif
if ($server_enablefiletransfers_set$ = "1")
Registry_server_enablefiletransfers_value_of /32Bit
Registry_server_enablefiletransfers_value_of /64Bit
endif
if ($server_removewallpaper_set$ = "1")
Registry_server_removewallpaper_value_of /32Bit
Registry_server_removewallpaper_value_of /64Bit
endif
if ($server_usemirrordriver_set$ = "1")
Registry_server_usemirrordriver_value_of /32Bit
Registry_server_usemirrordriver_value_of /64Bit
endif
if ($server_enableurlparams_set$ = "1")
Registry_server_enableurlparams_value_of /32Bit
Registry_server_enableurlparams_value_of /64Bit
endif
if ($server_alwaysshared_set$ = "1")
Registry_server_alwaysshared_value_of /32Bit
Registry_server_alwaysshared_value_of /64Bit
endif
if ($server_nevershared_set$ = "1")
Registry_server_nevershared_value_of /32Bit
Registry_server_nevershared_value_of /64Bit
endif
if ($server_disconnectclients_set$ = "1")
Registry_server_disconnectclients_value_of /32Bit
Registry_server_disconnectclients_value_of /64Bit
endif
if ($server_pollinginterval_set$ = "1")
Registry_server_pollinginterval_value_of /32Bit
Registry_server_pollinginterval_value_of /64Bit
endif
if ($server_allowloopback_set$ = "1")
Registry_server_allowloopback_value_of /32Bit
Registry_server_allowloopback_value_of /64Bit
endif
if ($server_grabtransparentwindows_set$ = "1")
Registry_server_grabtransparentwindows_value_of /32Bit
Registry_server_grabtransparentwindows_value_of /64Bit
endif
if ($server_savelogtoalluserspath_set$ = "1")
Registry_server_savelogtoalluserspath_value_of /32Bit
Registry_server_savelogtoalluserspath_value_of /64Bit
endif
if ($server_runcontrolinterface_set$ = "1")
Registry_server_runcontrolinterface_value_of /32Bit
Registry_server_runcontrolinterface_value_of /64Bit
endif
endif

View File

@ -8,6 +8,13 @@ Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
; comment stop TightVNC server
DosInAnIcon_stop_server
if (FileExists("%ProgramFiles32Dir%\DemoForge\Mirage Driver for TightVNC\unins000.exe")) OR (FileExists("%ProgramFiles64Dir%\DemoForge\Mirage Driver for TightVNC\unins000.exe"))
set $Reboot$="1"
endif
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","")
@ -67,12 +74,22 @@ endif
comment "Delete program shortcuts"
LinkFolder_uninstall
if $Reboot$="1"
ExitWindows /ImmediateReboot
endif
[DosInAnIcon_stop_server]
net stop tvnserver
ping 127.0.0.1 -n 5 >nul
taskkill /F /IM tvnserver.exe
ping 127.0.0.1 -n 5 >nul
[Winbatch_uninstall_msi_old_32]
%ProgramFiles32Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent
"%ProgramFiles32Dir%\DemoForge\Mirage Driver for TightVNC\unins000.exe" /silent
msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_32]
%ProgramFiles32Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent
"%ProgramFiles32Dir%\DemoForge\Mirage Driver for TightVNC\unins000.exe" /silent
msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
[Files_uninstall_32]
@ -81,11 +98,11 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
delete -sf "$InstallDir32$\"
[Winbatch_uninstall_msi_old_64]
%ProgramFiles64Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent
"%ProgramFiles64Dir%\DemoForge\Mirage Driver for TightVNC\unins000.exe" /silent
msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_64]
%ProgramFiles64Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent
"%ProgramFiles64Dir%\DemoForge\Mirage Driver for TightVNC\unins000.exe" /silent
msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
[Files_uninstall_64]

View File

@ -23,6 +23,8 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$
DefVar $Reboot$
Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
@ -49,7 +51,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$ = "%ProgramFiles32Dir%\TightVNC"
Set $InstallDir64$ = "%ProgramFiles64Dir%\TightVNC"
; ----------------------------------------------------------------
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@ -80,6 +82,8 @@ else
ChangeDirectory "%SCRIPTPATH%"
Winbatch_install_32
Sub_check_exitcode
DosInAnIcon_stop_server
Winbatch_install_DemoForge
comment "Copy files"
Files_install_32 /32Bit
comment "Patch Registry"
@ -94,6 +98,8 @@ else
ChangeDirectory "%SCRIPTPATH%"
Winbatch_install_64
Sub_check_exitcode
DosInAnIcon_stop_server
Winbatch_install_DemoForge
comment "Copy files"
Files_install_64 /64Bit
comment "Patch Registry"
@ -108,12 +114,25 @@ else
endif
comment "Reboot"
ExitWindows /Reboot
; ExitWindows /Reboot
DosInAnIcon_start_server
endif
[Winbatch_install_DemoForge]
"$InstallExe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES
set $ExitCode$ = "0"
[DosInAnIcon_start_server]
net start tvnserver
[DosInAnIcon_stop_server]
net stop tvnserver
ping 127.0.0.1 -n 5 >nul
taskkill /F /IM tvnserver.exe
ping 127.0.0.1 -n 5 >nul
[Winbatch_install_32]
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_32]
; copy the ini file to the InstallDir
@ -124,8 +143,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_install_64]
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
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$
[Files_install_64]
; copy the ini file to the InstallDir

View File

@ -22,6 +22,8 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$
DefVar $Reboot$
Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
@ -43,7 +45,7 @@ include_insert "define3264.inc"
; - Please edit the following values -
; ----------------------------------------------------------------
Set $InstallDir32$ = "%ProgramFiles32Dir%\TightVNC"
Set $InstallDir64$ = "%ProgramFiles32Dir%\TightVNC"
Set $InstallDir64$ = "%ProgramFiles64Dir%\TightVNC"
; ----------------------------------------------------------------
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"

View File

@ -5,7 +5,7 @@ VENDOR="tightvnc.com"
PN="tightvnc.server"
NAME="TightVNC Server"
DESCRIPTION="Free, Lightweight, Fast and Reliable Remote Control / Remote Desktop Software"
VERSION="2.6.4"
VERSION="2.7.1"
RELEASE="3"
PRIORITY="0"
ADVICE=""
@ -42,5 +42,4 @@ OPSI_INI_VALUE[0]="{981B8EDC-E693-4F22-9694-C0FF8E56F134}"
OPSI_INI_SECTION[1]="X86_64"
OPSI_INI_OPTION[1]="MsiId64"
OPSI_INI_VALUE[1]="{981B8EDC-E693-4F22-9694-C0FF8E56F134}"
OPSI_INI_VALUE[1]="{FBB9CFE8-8693-49D6-905A-E7406DFDD784}"

View File

@ -1 +0,0 @@
e94b957bcfd7a84f166f0de9f6454c78ef5bb11c /home/mario/.opsi-dist-cache/tightvnc.server-2.6.4/X86/tightvnc-2.6.4-setup-32bit.msi

View File

@ -1 +0,0 @@
5461588a556a56c712cc14b35ea075526bb7cf3d /home/mario/.opsi-dist-cache/tightvnc.server-2.6.4/X86_64/tightvnc-2.6.4-setup-64bit.msi

View File

@ -0,0 +1 @@
3bc60e45420e6d72e8703e1e3e24c1d6e8d31f92 /home/opsiproducts/.opsi-dist-cache/tightvnc.server-2.7.1/X86/tightvnc-2.7.1-setup-32bit.msi

View File

@ -0,0 +1 @@
03df730a5e11885d15229aeba87383c5ef92fc7a /home/opsiproducts/.opsi-dist-cache/tightvnc.server-2.7.1/X86_64/tightvnc-2.7.1-setup-64bit.msi