update to new opsi builder template

1329772954_ncybxklgphj7v8t.jpeg.sha1sum

@@ -1 +0,0 @@
-3cdf43db68067eeef3f0f117275c0b1542cfab49  /home/mario/.opsi-dist-cache/iron-17.0.1000.0//1329772954_ncybxklgphj7v8t.jpeg

CLIENT_DATA/delsub32.ins

@@ -1,13 +1,28 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib gmbh
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 
-Set $UninstallProgram$ = $InstallDir$ + "\unins000.exe"
+Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
+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 $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
+	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
@@ -23,13 +38,18 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
+[Winbatch_uninstall_old]
+"$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+
+
 [Winbatch_uninstall]
-"$UninstallProgram$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+"$UninstallProgram$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+
 
 [Files_uninstall]
-; Example for recursively deleting the installation directory (don't forget the trailing backslash):
+; Example for recursively deleting the installation directory:
 ;
-; delete -sf "$InstallDir$\"
+del -sf "$InstallDir$\"
 
 [Registry_uninstall]
 ; Example of deleting a registry key:

CLIENT_DATA/login.ins

@@ -0,0 +1,24 @@
+; Copyright (c) uib gmbh (www.uib.de)
+; This sourcecode is owned by uib gmbh
+; and published under the Terms of the General Public License.
+; credits: http://www.opsi.org/en/credits/
+
+[Actions]
+Message "Profile Patch for VLC ...."
+
+comment "Did we run this script before ? - and set version stamp in profile"
+if getValue("installationstate", getProductMap) = "installed"
+	comment "Product is installed"
+	if not (scriptWasExecutedBefore)
+		comment "loginscript was not run yet "
+		Files_profile_copy
+		Registry_currentuser_set
+	endif
+endif
+
+[Files_profile_copy]
+copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME"
+
+[Registry_currentuser_set]
+openkey [HKCU\Software\ACME]
+set "show_greeting_window" = "no"

CLIENT_DATA/opsi-srware.iron.ini

@@ -0,0 +1,5 @@
+[X86]
+
+[COMMON]
+PN=name
+VERSION=version

CLIENT_DATA/setup32.ins

@@ -1,17 +1,23 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
 
 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
+DefVar $IniFile$
+DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
 DefVar $InstallDir$
 DefVar $ExitCode$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -31,28 +37,30 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ;$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 $ProductId$       = "srware.iron"
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\SRWare Iron"
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
+
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
-	isFatalError
+	isFatalError "No Space"
 	; 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%"
 	Winbatch_install
 	Sub_check_exitcode
 	
@@ -65,25 +73,15 @@ else
 	comment "Create shortcuts"
 	LinkFolder_install
 	
-	comment "Test for installation success"
-	; Test if software marked as installed in registry
-	; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "")
-	; 	logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found"
-	; 	isFatalError
-	; else
-	; 	comment "Successful Installation"
-	; endif
-
 endif
 
 [Winbatch_install]
-; Choose one of the following examples as basis for your installation
+"$InstallExe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES
-; You can use $LicenseKey$ var to pass a license key to the installer
-;
-; === Nullsoft Scriptable Install System ================================================================
-"$InstallExe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
 
 [Files_install]
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir$"
+
 ; Example of recursively copying some files into the installation directory:
 ;
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"

CLIENT_DATA/uninstall32.ins

@@ -1,16 +1,22 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib gmbh
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+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"
 
@@ -27,13 +33,13 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "srware.iron"
 Set $InstallDir$      = "%ProgramFiles32Dir%\SRWare Iron"
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 

builder-product.cfg

@@ -3,7 +3,9 @@
 ############################
 VENDOR="srware.net"
 PN="srware.iron"
-VERSION="24.0.1350.0"
+NAME="SRWare Iron"
+DESCRIPTION="Der Browser der Zukunft"
+VERSION="25.0.1400.0"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -12,8 +14,8 @@ ADVICE=""
 # Valid value: restricted | public
 TYPE="public"
 
-DL_FILE[0]="1329772954_ncybxklgphj7v8t.jpeg"
+DL_FILE[0]="srware-iron1.png"
-DL_SOURCE[0]="http://softwarez.su/uploads/posts/2012-02/1329772954_ncybxklgphj7v8t.jpeg"
+DL_SOURCE[0]="http://candidsoftwares.com/wp-content/uploads/2012/05/srware-iron1.png"
 
 DL_FILE[1]="srware_iron-${VERSION}.exe"
 DL_SOURCE[1]="http://www.srware.net/downloads/srware_iron.exe"
@@ -22,3 +24,7 @@ DL_WINST_NAME[1]=InstallExe
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
+
+OPSI_INI_SECTION[0]="X86"
+OPSI_INI_OPTION[0]="UninstallProg"
+OPSI_INI_VALUE[0]="unins000.exe"

srware-iron1.png.sha1sum

@@ -0,0 +1 @@
+e1a5170757013257b55e03e95187fa0a92986968  /home/mario/.opsi-dist-cache/srware.iron-25.0.1400.0//srware-iron1.png

srware_iron-24.0.1350.0.exe.sha1sum

@@ -1 +0,0 @@
-fe832f602774b11523aefa26bb28f30bb8dea3fb  /home/mario/.opsi-dist-cache/srware.iron-24.0.1350.0/X86/srware_iron-24.0.1350.0.exe

srware_iron-25.0.1400.0.exe.sha1sum

@@ -0,0 +1 @@
+dbb0b40f7efea0fd39a5cb6b3b3a3129de56c4c6  /home/mario/.opsi-dist-cache/srware.iron-25.0.1400.0/X86/srware_iron-25.0.1400.0.exe