Update templates to Nicer output with version in/uninstall information

sample/32bit/installer/nolicense/CLIENT_DATA/delsub32.ins

@@ -4,11 +4,25 @@
 ; credits: http://www.opsi.org/en/credits/
 
 
+Set $UninstallProgramOld$ = $InstallDir$ + $UninstallProg$
 Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
 
-Message "Uninstalling " + $ProductId$ + " ..."
+if FileExists($IniFile$)
+	Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+	Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+	Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
 
+if FileExists($IniFile$)
+        Set $UninstallProgramOld$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+	if FileExists($UninstallProgramOld$)
+		comment "Uninstall program found, starting uninstall"
+		Winbatch_uninstall_old
+		sub_check_exitcode
+	endif
+endif
 if FileExists($UninstallProgram$)
 	comment "Uninstall program found, starting uninstall"
 	Winbatch_uninstall
@@ -24,6 +38,18 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
+[Winbatch_uninstall_old]
+; Choose one of the following examples as basis for program uninstall
+;
+; === Nullsoft Scriptable Install System ================================================================
+; maby better Call as
+; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+; "$UninstallProgramOld$" /S
+;
+; === Inno Setup ========================================================================================
+; "$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+
+
 [Winbatch_uninstall]
 ; Choose one of the following examples as basis for program uninstall
 ;

sample/32bit/installer/nolicense/CLIENT_DATA/setup32.ins

@@ -7,6 +7,7 @@
 requiredWinstVersion >= "4.11.2.6"
 
 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
@@ -14,6 +15,9 @@ DefVar $ProductId$
 DefVar $MinimumSpace$
 DefVar $InstallDir$
 DefVar $ExitCode$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -46,14 +50,14 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	if FileExists("%ScriptPath%\delsub32.ins")
 		comment "Start uninstall sub section"
 		Sub "%ScriptPath%\delsub32.ins"
 	endif
 	
-	Message "Installing " + $ProductId$ + " ..."
+	Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
 	
 	comment "Start setup program"
 	ChangeDirectory "%SCRIPTPATH%"

sample/32bit/installer/nolicense/CLIENT_DATA/uninstall32.ins

@@ -7,12 +7,16 @@
 requiredWinstVersion >= "4.11.2.6"
 
 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
 DefVar $InstallDir$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -35,7 +39,7 @@ Set $InstallDir$      = "%ProgramFiles32Dir%\<path to the product>"
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."