From 6ff8245e8c05fd4cf6a4b4dec7a99b0614653b87 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 16 Aug 2013 17:24:34 +0200 Subject: [PATCH] split the common control for the server in its own control script --- CLIENT_DATA/control3264.ins | 8 ++++++++ CLIENT_DATA/define3264.inc | 9 --------- CLIENT_DATA/setup3264.ins | 5 +++++ CLIENT_DATA/uninstall3264.ins | 6 ++++++ 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 CLIENT_DATA/control3264.ins diff --git a/CLIENT_DATA/control3264.ins b/CLIENT_DATA/control3264.ins new file mode 100644 index 0000000..3b1b1ee --- /dev/null +++ b/CLIENT_DATA/control3264.ins @@ -0,0 +1,8 @@ +[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 + +[DosInAnIcon_start_server] +net start tvnserver diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc index 3fd1f7b..dccfc9f 100644 --- a/CLIENT_DATA/define3264.inc +++ b/CLIENT_DATA/define3264.inc @@ -136,12 +136,3 @@ 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", "") - -[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 - -[DosInAnIcon_start_server] -net start tvnserver diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index e74d15f..4730ac2 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -68,6 +68,11 @@ else comment "Show product picture" ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ + if FileExists("%ScriptPath%\control3264.ins") + comment "Include Control sub section" + Sub "%ScriptPath%\control3264.ins" + endif + comment "Stop TightVNC Server" DosInAnIcon_stop_server diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index 604b210..259f930 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -59,7 +59,13 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." +if FileExists("%ScriptPath%\control3264.ins") + comment "Include Control sub section" + Sub "%ScriptPath%\control3264.ins" +endif + if FileExists("%ScriptPath%\delsub3264.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub3264.ins" endif +