update to new opsi builder

CLIENT_DATA/delsub32.ins

@@ -1,12 +1,17 @@
 ; 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 $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 $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
@@ -38,9 +43,9 @@ msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
 msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
 
 [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/setup32.ins

@@ -1,14 +1,12 @@
 ; 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 $MsiId$
 DefVar $MsiIdOld$
-DefVar $UninstallProgram$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
@@ -16,6 +14,9 @@ DefVar $ProductId$
 DefVar $MinimumSpace$
 DefVar $InstallDir$
 DefVar $ExitCode$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -35,29 +36,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$       = "adobe.acrobatreader"
+Set $MinimumSpace$    = "320 MB"
-Set $MinimumSpace$    = "150 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\Adobe\Reader 11.0\Reader\"
-Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 ; ----------------------------------------------------------------
 
+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
 	
@@ -70,19 +72,10 @@ 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]
-msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+msiexec /i "%$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
 
 [Files_install]
 ; copy the ini file to the InstallDir

CLIENT_DATA/uninstall32.ins

@@ -1,20 +1,21 @@
 ; 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 $MsiId$
 DefVar $MsiIdOld$
-DefVar $UninstallProgram$
-DefVar $LogDir$
 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"
 
@@ -31,13 +32,13 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "adobe.acrobatreader"
 Set $InstallDir$      = "%ProgramFiles32Dir%\Adobe\Reader 11.0\Reader\"
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
@@ -45,3 +46,4 @@ if FileExists("%ScriptPath%\delsub32.ins")
 	comment "Start uninstall sub section"
 	Sub "%ScriptPath%\delsub32.ins"
 endif
+

builder-product.cfg

@@ -27,5 +27,6 @@ ICON_DL_INDEX=0
 WINST_NAME[0]="InstallMsi"
 WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\AcroRead.msi"
 
-WINST_NAME[1]="MsiId"
+OPSI_INI_SECTION[0]="X86"
-WINST_VALUE[1]="{AC76BA86-7AD7-1031-7B44-AA1000000001}"
+OPSI_INI_OPTION[0]="MsiId"
+OPSI_INI_VALUE[0]="{AC76BA86-7AD7-1031-7B44-AA1000000001}"