update to new opsi builder template

CLIENT_DATA/delsub3264.ins

@@ -1,16 +1,29 @@
 ; 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 $MsiId32$ = '{90140000-003D-0000-0000-0000000FF1CE}'
+Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
 
-Set $MsiId64$ = '{90140000-003D-0000-1000-0000000FF1CE}'
+Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-	Message "Uninstalling " + $ProductId$ + " 32 Bit..."
+	if FileExists($IniFile32$)
+    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","")
+	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","")
+	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","")
+	endif
+	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
 
+        if FileExists($IniFile32$)
+                Set $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
+                if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "")
+                        comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version"
+                        Winbatch_uninstall_msi_old_32
+                        sub_check_exitcode
+                endif
+        endif
 	if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
 		comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
 		Winbatch_uninstall_msi_32
@@ -24,8 +37,21 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 endif
 
 if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-	Message "Uninstalling " + $ProductId$ + " 64 Bit..."
+	if FileExists($IniFile64$)
+    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","")
+	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","")
+	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","")
+	endif
+	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
 
+        if FileExists($IniFile64$)
+                Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
+                if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "")
+                        comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version"
+                        Winbatch_uninstall_msi_old_64
+                        sub_check_exitcode
+                endif
+        endif
 	if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
 		comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
 		Winbatch_uninstall_msi_64
@@ -41,8 +67,10 @@ endif
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
+[Winbatch_uninstall_msi_old_32]
+"%SystemDrive%\MSOCache\All Users\$MsiIdOld32$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SingleImage
+
 [Winbatch_uninstall_msi_32]
-;msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 "%SystemDrive%\MSOCache\All Users\$MsiId32$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SingleImage
 
 [Files_uninstall_32]
@@ -50,14 +78,16 @@ LinkFolder_uninstall
 ;
 ; delete -sf "$InstallDir32$\"
 
+[Winbatch_uninstall_msi_old_64]
+"%SystemDrive%\MSOCache\All Users\$MsiIdOld64$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SingleImage
+
 [Winbatch_uninstall_msi_64]
-;msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
 "%SystemDrive%\MSOCache\All Users\$MsiId64$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SingleImage
 
 [Files_uninstall_64]
-; Example for recursively deleting the installation directory (don't forget the trailing backslash):
+; Example for recursively deleting the installation directory:
 ;
-; delete -sf "$InstallDir64$\"
+; del -sf "$InstallDir64$\"
 
 [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-microsoft.office2010.ini

@@ -0,0 +1,9 @@
+[X86]
+MsiId32={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
+
+[X86_64]
+MsiId64={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
+
+[COMMON]
+PN=name
+VERSION=version

CLIENT_DATA/setup3264.ins

@@ -1,13 +1,16 @@
 ; 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 $MsiId32$
+DefVar $MsiIdOld32$
-DefVar $MsiId64$
+DefVar $IniFile32$
+DefVar $MsiIdOld64$
+DefVar $IniFile64$
+DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
@@ -19,11 +22,13 @@ DefVar $LicenseKey$
 DefVar $LicensePool$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $INST_SystemType$ = GetSystemType
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
-
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -42,22 +47,23 @@ 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$       = "microsoft.office2010"
+Set $MinimumSpace$    = "1 MB"
-Set $MinimumSpace$    = "1500 MB"
 ; the path were we find the product after the installation
-Set $InstallDir32$      = "%ProgramFiles32Dir%\Microsoft Office"
+Set $InstallDir32$      = "%ProgramFiles32Dir%\Microsoft Office\Office14"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\Microsoft Office"
+Set $InstallDir64$      = "%ProgramFiles64Dir%\Microsoft Office\Office14"
 Set $LicenseRequired$ = "true"
 Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
+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
 	; 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%\delsub3264.ins")
 		comment "Start uninstall sub section"
@@ -72,7 +78,9 @@ else
 	comment "installing"
 
 	if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-		Message "Installing " + $ProductId$ + " 32 Bit..."
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
+		comment "Start setup program"
+		ChangeDirectory "%SCRIPTPATH%"
 
 		comment "Remove Install Files"
 		Winbatch_remove_32
@@ -81,9 +89,9 @@ else
 		Winbatch_extract_32
 		Sub_check_exitcode
 
-;		comment "Extract Office Updates"
+		;comment "Extract Office Updates"
-;		Winbatch_update_32
+		;Winbatch_update_32
-;		Sub_check_exitcode
+		;Sub_check_exitcode
 
 		comment "Create License File"
 		Dosbatch_license_32
@@ -106,7 +114,9 @@ else
 	endif
 
 	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-		Message "Installing " + $ProductId$ + " 64 Bit..."
+		Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
+		comment "Start setup program"
+		ChangeDirectory "%SCRIPTPATH%"
 
 		comment "Remove Install Files"
 		Winbatch_remove_64
@@ -115,9 +125,9 @@ else
 		Winbatch_extract_64
 		Sub_check_exitcode
 
-;		comment "Extract Office Updates"
+		;comment "Extract Office Updates"
-;		Winbatch_update_64
+		;Winbatch_update_64
-;		Sub_check_exitcode
+		;Sub_check_exitcode
 
 		comment "Create License File"
 		Dosbatch_license_64
@@ -144,8 +154,8 @@ endif
 [Winbatch_extract_32]
 $Install32Exe$ /quiet /extract:$LogDir$\msoffice2010-32
 
-[Winbatch_update_32]
+;[Winbatch_update_32]
-$Install32Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-32\Updates
+;$Install32Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-32\Updates
 
 [Dosbatch_license_32]
 xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir32$" %ScriptPath%\config.xml > $LogDir$\msoffice2010-32.xml
@@ -157,6 +167,9 @@ xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/U
 delete -sf "$LogDir$\msoffice2010-32\"
 
 [Files_install_32]
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir32$"
+
 ; Example of recursively copying some files into the installation directory:
 ;
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
@@ -164,8 +177,8 @@ delete -sf "$LogDir$\msoffice2010-32\"
 [Winbatch_extract_64]
 $Install64Exe$ /quiet /extract:$LogDir$\msoffice2010-64
 
-[Winbatch_update_64]
+;[Winbatch_update_64]
-$Install64Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-64\Updates
+;$Install64Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-64\Updates
 
 [Dosbatch_license_64]
 xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir64$" %ScriptPath%\config.xml > $LogDir$\msoffice2010-64.xml
@@ -177,6 +190,9 @@ xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/U
 delete -sf "$LogDir$\msoffice2010-64\"
 
 [Files_install_64]
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir64$"
+
 ; Example of recursively copying some files into the installation directory:
 ;
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"

CLIENT_DATA/uninstall3264.ins

@@ -1,13 +1,16 @@
 ; 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 $MsiId32$
+DefVar $MsiIdOld32$
-DefVar $MsiId64$
+DefVar $IniFile32$
+DefVar $MsiIdOld64$
+DefVar $IniFile64$
+DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
@@ -17,11 +20,13 @@ DefVar $LicenseRequired$
 DefVar $LicensePool$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $INST_SystemType$ = GetSystemType
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
-
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -37,16 +42,16 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "microsoft.office2010"
+Set $InstallDir32$    = "%ProgramFiles32Dir%\<path to the product>"
-Set $InstallDir32$    = "%ProgramFiles32Dir%\Microsoft Office"
+Set $InstallDir64$    = "%ProgramFiles64Dir%\<path to the product>"
-Set $InstallDir64$    = "%ProgramFiles64Dir%\Microsoft Office"
+Set $LicenseRequired$ = "false"
-Set $LicenseRequired$ = "true"
 Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
+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,6 +3,8 @@
 ############################
 VENDOR="microsoft.com"
 PN="microsoft.office2010"
+NAME="Microsoft Office 2010"
+DESCRIPTION="Microsoft Office 2010 ist ein Office-Paket von Microsoft aus der Microsoft-Office-Serie."
 VERSION="2010.1"
 RELEASE="3"
 PRIORITY="0"
@@ -38,3 +40,10 @@ DL_WINST_NAME[2]=Install64Exe
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
+OPSI_INI_SECTION[0]="X86"
+OPSI_INI_OPTION[0]="MsiId32"
+OPSI_INI_VALUE[0]="{90140000-003D-0000-0000-0000000FF1CE}"
+
+OPSI_INI_SECTION[1]="X86_64"
+OPSI_INI_OPTION[1]="MsiId64"
+OPSI_INI_VALUE[1]="{90140000-003D-0000-1000-0000000FF1CE}"