From c78d196b1fe7604fab88f2a341d265d6b866fdd7 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Fri, 16 Aug 2013 18:01:11 +0200
Subject: [PATCH] correct some typos and move the control to its own inc file

---
 CLIENT_DATA/{control3264.ins => control3264.inc} |  0
 CLIENT_DATA/delsub3264.ins                       |  4 ++--
 CLIENT_DATA/setup3264.ins                        | 11 +++++------
 CLIENT_DATA/uninstall3264.ins                    |  9 ++++-----
 4 files changed, 11 insertions(+), 13 deletions(-)
 rename CLIENT_DATA/{control3264.ins => control3264.inc} (100%)

diff --git a/CLIENT_DATA/control3264.ins b/CLIENT_DATA/control3264.inc
similarity index 100%
rename from CLIENT_DATA/control3264.ins
rename to CLIENT_DATA/control3264.inc
diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index 823375e..faf7d7a 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -20,7 +20,7 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
 
         if FileExists($IniFile32$)
-		Set $UninstallProg32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe")
+		Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe")
 		Set $UninstallProgramOld32$ = $InstallDirMirage32$ + "\" + $UninstallProg32$
 		if FileExists($UninstallProgramOld32$)
 			comment "Uninstall program found, starting uninstall"
@@ -64,7 +64,7 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
 
         if FileExists($IniFile64$)
-		Set $UninstallProg64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe")
+		Set $UninstallProg64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
 		Set $UninstallProgramOld64$ = $InstallDirMirage64$ + "\" + $UninstallProg64$
 		if FileExists($UninstallProgramOld64$)
 			comment "Uninstall program found, starting uninstall"
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 4730ac2..a3b66d8 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -20,6 +20,8 @@ DefVar $ProductId$
 DefVar $MinimumSpace$
 DefVar $InstallDir32$
 DefVar $InstallDir64$
+DefVar $InstallDirMirage32$
+DefVar $InstallDirMirage64$
 DefVar $ExitCode$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
@@ -50,7 +52,7 @@ include_insert "define3264.inc"
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $MinimumSpace$    = "1 MB"
+Set $MinimumSpace$    = "30 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\TightVNC"
 Set $InstallDir64$      = "%ProgramFiles64Dir%\TightVNC"
@@ -68,11 +70,6 @@ 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
 
@@ -231,3 +228,5 @@ else
 	endif
 endif
 
+include_insert "control3264.inc"
+
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
index 259f930..362a825 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -20,6 +20,8 @@ DefVar $ExitCode$
 DefVar $ProductId$
 DefVar $InstallDir32$
 DefVar $InstallDir64$
+DefVar $InstallDirMirage32$
+DefVar $InstallDirMirage64$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
 DefVar $OLD_VERSION$
@@ -59,13 +61,10 @@ 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
 
+include_insert "control3264.inc"
+