update to new opsi builder template

CLIENT_DATA/delsub32.ins

@@ -1,13 +1,26 @@
 ; 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 $MsiId$ = '{F1CECE09-7CBE-4E98-B435-DA87CDA86167}'
+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}")
+        if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "")
+                comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version"
+                Winbatch_uninstall_msi_old
+                sub_check_exitcode
+        endif
+endif
 if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "")
 	comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall"
 	Winbatch_uninstall_msi
@@ -23,13 +36,16 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
+[Winbatch_uninstall_msi_old]
+msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
+
 [Winbatch_uninstall_msi]
 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:
@@ -37,16 +53,8 @@ delete -sf "$InstallDir$\"
 ; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
 
 [LinkFolder_uninstall]
-; Example of deleting a folder from AllUsers startmenu:
-;
 set_basefolder common_programs
 delete_subfolder Skype
-;
-; Example of deleting a shortcut from AllUsers desktop:
-;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-; delete_element $ProductId$
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"

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.skype.ini

@@ -0,0 +1,6 @@
+[X86]
+MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
+
+[COMMON]
+PN=name
+VERSION=version

CLIENT_DATA/setup32.ins

@@ -1,17 +1,22 @@
 ; 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 $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 +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$       = "microsoft.skype"
 Set $MinimumSpace$    = "30 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\Skype"
 ; ----------------------------------------------------------------
 
+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,44 +72,32 @@ 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 -s "$InstallExe$" "$InstallDir$"
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir$"
+
 ; Example of recursively copying some files into the installation directory:
 ;
-copy -s "$InstallExe$" "$InstallDir$"
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
 ;
-; openkey [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Run]
+; openkey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
-; set "KillSkypeHome" = "$InstallDir$\KillSkypeHome.exe"
+; set "name1" = "some string value"
 ; set "name2" = REG_DWORD:0001
 ; set "name3" = REG_BINARY:00 af 99 cd
 
 [LinkFolder_install]
-; Example of deleting a folder from AllUsers startmenu:
-;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
-;
-; Example of creating an shortcut to the installed exe in AllUsers startmenu:
-;
 set_basefolder common_programs
 set_subfolder Skype
-;
+
 set_link
 	name: Kill Skype Home
 	target: $InstallDir$/KillSkypeHome.exe
@@ -111,20 +106,6 @@ set_link
 	icon_file: $InstallDir$/KillSkypeHome.exe
 	icon_index: 0
 end_link
-;
-; Example of creating an shortcut to the installed exe on AllUsers desktop:
-;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-;
-; set_link
-; 	name: $ProductId$
-; 	target: <path to the program>
-; 	parameters: <some_param>
-; 	working_dir: $InstallDir$
-; 	icon_file: <path to icon file>
-; 	icon_index: 2
-; end_link
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"

CLIENT_DATA/uninstall32.ins

@@ -1,16 +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 $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 +32,13 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "microsoft.skype"
 Set $InstallDir$      = "%ProgramFiles32Dir%\Skype"
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
@@ -41,3 +46,4 @@ if FileExists("%ScriptPath%\delsub32.ins")
 	comment "Start uninstall sub section"
 	Sub "%ScriptPath%\delsub32.ins"
 endif
+

OPSI/control

@@ -20,20 +20,3 @@ alwaysScript:
 onceScript: 
 customScript: 
 userLoginScript: 
-
-[ProductProperty]
-type: unicode
-name: install_architecture
-multivalue: False
-editable: False
-description: which architecture (32/64 bit) has to be installed
-values: ["32 only", "64 only", "both", "system specific"]
-default: ["system specific"]
-
-[ProductDependency]
-action: setup
-requiredProduct: mozilla.firefox
-requiredStatus: installed
-requirementType: before
-
-

SkypeSetup-6.2.32.106.msi.sha1sum

@@ -1 +0,0 @@
-168f9b235c853efd26395c3b606f8358313eb6bd  /home/mario/.opsi-dist-cache/microsoft.skype-6.2.32.106/X86/SkypeSetup-6.2.32.106.msi

SkypeSetup-6.3.32.105.msi.sha1sum

@@ -0,0 +1 @@
+4913d98c032d1eca73865288565c2c80029fda97  /home/mario/.opsi-dist-cache/microsoft.skype-6.3.32.105/X86/SkypeSetup-6.3.32.105.msi

builder-product.cfg

@@ -3,7 +3,9 @@
 ############################
 VENDOR="microsoft.com"
 PN="microsoft.skype"
-VERSION="6.2.32.106"
+NAME="Microsoft Skype"
+DESCRIPTION="Skype ist eine kostenlose VoIP-Software mit Instant-Messaging-Funktion, Dateiuebertragung und Videotelefonie, die ein proprietaeres Protokoll verwendet."
+VERSION="6.3.32.105"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -13,8 +15,8 @@ ADVICE=""
 TYPE="public"
 
   
-DL_FILE[0]="microsoft-kauft-skype.jpg"
+DL_FILE[0]="microsoft-skype.jpeg"
-DL_SOURCE[0]="http://www.iphone-news.org/wp-content/uploads/2011/05/microsoft-kauft-skype.jpg"
+DL_SOURCE[0]="http://www.technocrates.org/wp-content/uploads/2012/10/microsoft-skype.jpeg"
 
 DL_FILE[1]="SkypeSetup-${VERSION}.msi"
 DL_SOURCE[1]="http://www.skype.com/go/getskype-msi"
@@ -29,3 +31,6 @@ DL_WINST_NAME[2]=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]="MsiId"
+OPSI_INI_VALUE[0]="{1845470B-EB14-4ABC-835B-E36C693DC07D}"

microsoft-kauft-skype.jpg.sha1sum

@@ -1 +0,0 @@
-fc73707a95a70d255c72a88429371762937bc59f  /home/mario/.opsi-dist-cache/skype-5.8.32.156//microsoft-kauft-skype.jpg

microsoft-skype.jpeg.sha1sum

@@ -0,0 +1 @@
+f61be168b71a0c8574c5525736b59c23e17c5438  /home/mario/.opsi-dist-cache/microsoft.skype-6.3.32.105//microsoft-skype.jpeg