Bump and add x86_64 support

CLIENT_DATA/delsub32.ins

@@ -1,97 +0,0 @@
-; 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/
-
-
-Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
-Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
-
-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  /WaitforProcessending "Au_.exe" /Timeoutseconds 50
-		sub_check_exitcode
-	endif
-endif
-if FileExists($UninstallProgram$)
-	comment "Uninstall program found, starting uninstall"
-	Winbatch_uninstall  /WaitforProcessending "Au_.exe" /Timeoutseconds 50
-	sub_check_exitcode
-endif
-
-comment "Delete files"
-Files_uninstall /32Bit
-
-comment "Cleanup registry"
-Registry_uninstall /32Bit
-
-comment "Delete program shortcuts"
-LinkFolder_uninstall
-
-[Winbatch_uninstall_old]
-"$UninstallProgramOld$" -ms
-
-[Winbatch_uninstall]
-"$UninstallProgram$" -ms
-
-[Files_uninstall]
-; Example for recursively deleting the installation directory:
-;
-del -sf "$InstallDir$\"
-
-[Registry_uninstall]
-; Example of deleting a registry key:
-;
-; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
-
-[LinkFolder_uninstall]
-; Example of deleting a folder from AllUsers startmenu:
-;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
-;
-; 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"
-set $ExitCode$ = getLastExitCode
-; informations to exit codes see
-; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx
-; http://msdn.microsoft.com/en-us/library/aa368542.aspx
-if ($ExitCode$ = "0")
-	comment "Looks good: setup program gives exitcode zero"
-else
-	comment "Setup program gives a exitcode unequal zero: " + $ExitCode$
-	if ($ExitCode$ = "1605")
-		comment "ERROR_UNKNOWN_PRODUCT	1605	This action is only valid for products that are currently installed."
-		comment "Uninstall of a not installed product failed - no problem"
-	else
-		if ($ExitCode$ = "1641")
-			comment "looks good: setup program gives exitcode 1641"
-			comment "ERROR_SUCCESS_REBOOT_INITIATED	1641	The installer has initiated a restart. This message is indicative of a success."
-		else
-			if ($ExitCode$ = "3010")
-				comment "looks good: setup program gives exitcode 3010"
-				comment "ERROR_SUCCESS_REBOOT_REQUIRED	3010	A restart is required to complete the install. This message is indicative of a success."
-			else
-				logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$
-				isFatalError
-			endif
-		endif
-	endif
-endif
-

CLIENT_DATA/delsub3264.ins

@@ -0,0 +1,141 @@
+; 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/
+
+
+Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$
+Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
+
+Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallProg64$
+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")
+	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 $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe")
+		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
+		if FileExists($UninstallProgramOld32$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 50
+			sub_check_exitcode
+		endif
+        endif
+	if FileExists($UninstallProgram32$)
+		comment "Uninstall program found, starting uninstall"
+		Winbatch_uninstall_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 50
+		sub_check_exitcode
+	endif
+
+	comment "Delete files"
+	Files_uninstall_32 /32Bit
+	comment "Cleanup registry"
+	Registry_uninstall /32Bit
+endif
+
+if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
+	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 $UninstallProg64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
+		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
+		if FileExists($UninstallProgramOld64$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 50
+			sub_check_exitcode
+		endif
+        endif
+	if FileExists($UninstallProgram64$)
+		comment "Uninstall program found, starting uninstall"
+		Winbatch_uninstall_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 50
+		sub_check_exitcode
+	endif
+
+	comment "Delete files"
+	Files_uninstall_64 /64Bit
+	comment "Cleanup registry"
+	Registry_uninstall /64Bit
+endif
+
+comment "Delete program shortcuts"
+LinkFolder_uninstall
+
+[Winbatch_uninstall_old_32]
+"$UninstallProgramOld32$" -ms
+
+[Winbatch_uninstall_32]
+"$UninstallProgram32$" -ms
+
+[Files_uninstall_32]
+; Example for recursively deleting the installation directory (don't forget the trailing backslash):
+;
+delete -sf "$InstallDir32$\"
+
+[Winbatch_uninstall_old_64]
+"$UninstallProgramOld64$" -ms
+
+[Winbatch_uninstall_64]
+"$UninstallProgram64$" -ms
+
+[Files_uninstall_64]
+; Example for recursively deleting the installation directory:
+;
+del -sf "$InstallDir64$\"
+
+[Registry_uninstall]
+; Example of deleting a registry key:
+;
+; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
+
+[LinkFolder_uninstall]
+; Example of deleting a folder from AllUsers startmenu:
+;
+; set_basefolder common_programs
+; delete_subfolder $ProductId$
+;
+; 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"
+set $ExitCode$ = getLastExitCode
+; informations to exit codes see
+; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx
+; http://msdn.microsoft.com/en-us/library/aa368542.aspx
+if ($ExitCode$ = "0")
+	comment "Looks good: setup program gives exitcode zero"
+else
+	comment "Setup program gives a exitcode unequal zero: " + $ExitCode$
+	if ($ExitCode$ = "1605")
+		comment "ERROR_UNKNOWN_PRODUCT	1605	This action is only valid for products that are currently installed."
+		comment "Uninstall of a not installed product failed - no problem"
+	else
+		if ($ExitCode$ = "1641")
+			comment "looks good: setup program gives exitcode 1641"
+			comment "ERROR_SUCCESS_REBOOT_INITIATED	1641	The installer has initiated a restart. This message is indicative of a success."
+		else
+			if ($ExitCode$ = "3010")
+				comment "looks good: setup program gives exitcode 3010"
+				comment "ERROR_SUCCESS_REBOOT_REQUIRED	3010	A restart is required to complete the install. This message is indicative of a success."
+			else
+				logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$
+				isFatalError
+			endif
+		endif
+	endif
+endif
+

CLIENT_DATA/setup3264.ins

@@ -6,21 +6,30 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
-DefVar $UninstallProgram$
+DefVar $UninstallProgram32$
-DefVar $UninstallProgramOld$
+DefVar $UninstallProgramOld32$
-DefVar $IniFile$
+DefVar $IniFile32$
+DefVar $UninstallProgram64$
+DefVar $UninstallProgramOld64$
+DefVar $IniFile64$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
-DefVar $InstallDir$
+DefVar $InstallDir32$
+DefVar $InstallDir64$
 DefVar $ExitCode$
+DefVar $INST_SystemType$
+DefVar $INST_architecture$
 DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
-; DefVar 	$InstallDir$
+DefVar $InstallDir$
-DefVar 	$ProgExe$
+DefVar $ProgExe$
+
+Set $INST_SystemType$ = GetSystemType
+set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -42,44 +51,62 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; no white space use '-' as a seperator
 Set $MinimumSpace$    = "200 MB"
 ; the path were we find the product after the installation
-Set $InstallDir$      = "%ProgramFiles32Dir%\Mozilla Firefox"
+Set $InstallDir32$      = "%ProgramFiles32Dir%\Mozilla Firefox"
+Set $InstallDir64$      = "%ProgramFiles64Dir%\Mozilla Firefox"
 ; ----------------------------------------------------------------
 
 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 "No Space"
+	isFatalError
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
 	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
-	if FileExists("%ScriptPath%\delsub32.ins")
+	if FileExists("%ScriptPath%\delsub3264.ins")
 		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub32.ins"
+		Sub "%ScriptPath%\delsub3264.ins"
 	endif
 	
-	Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
+	comment "installing"
-	
+
-	comment "Start setup program"
+	if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-	ChangeDirectory "%SCRIPTPATH%"
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
-	Winbatch_install
+		comment "Start setup program"
-	Sub_check_exitcode
+		ChangeDirectory "%SCRIPTPATH%"
-	
+		Winbatch_install_32
-	comment create associations
+		Sub_check_exitcode
-;	Set $InstallDir$ = $InstallDir32$
+		comment create associations
-	Set $ProgExe$ = $Prog32$
+		Set $InstallDir$ = $InstallDir32$
-	DosInAnIcon_install winst /Sysnative
+		Set $ProgExe$ = $Prog32$
-	
+		DosInAnIcon_install winst /Sysnative
-	comment "Copy files"
+		comment "Copy files"
-	Files_install /32Bit
+		Files_install_32 /32Bit
-	
+		comment "Patch Registry"
-	comment "Patch Registry"
+		Registry_install /32Bit
-	Registry_install /32Bit
+		comment "Create shortcuts"
-	
+		LinkFolder_install
-	comment "Create shortcuts"
+	endif
-	LinkFolder_install
+
+	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
+		comment "Start setup program"
+		ChangeDirectory "%SCRIPTPATH%"
+		Winbatch_install_64
+		Sub_check_exitcode
+		comment create associations
+		Set $InstallDir$ = $InstallDir64$
+		Set $ProgExe$ = $Prog64$
+		DosInAnIcon_install winst /Sysnative
+		comment "Copy files"
+		Files_install_64 /64Bit
+		comment "Patch Registry"
+		Registry_install /64Bit
+		comment "Create shortcuts"
+		LinkFolder_install
+	endif
 	
 endif
 
@@ -103,35 +130,59 @@ SET Extn=http-1 https-1 ftp-1 .htm-1 .html-1 .shtml-1 .xht-1 .xhtml-1
 
 FOR %%j IN (%Extn%) DO (
 
-	FOR /F "tokens=1,2 delims=-" %%A IN ("%%j") DO (
+        FOR /F "tokens=1,2 delims=-" %%A IN ("%%j") DO (
-		REG ADD %SC%\%%A /VE /D "Firefox-%%A" /F
+                REG ADD %SC%\%%A /VE /D "Firefox-%%A" /F
-		REG ADD %SC%\Firefox-%%A /VE /D "%%A Firefox" /F
+                REG ADD %SC%\Firefox-%%A /VE /D "%%A Firefox" /F
-		REG ADD %SC%\Firefox-%%A\DefaultIcon /VE /D "$InstallDir$\%Prog%.exe,%%B" /F
+                REG ADD %SC%\Firefox-%%A\DefaultIcon /VE /D "$InstallDir$\%Prog%.exe,%%B" /F
-		REG ADD %SC%\Firefox-%%A\shell\open\command /VE /D "\"%InstallDir%\%Prog%.exe\" -osint -url \"%%1\"" /F
+                REG ADD %SC%\Firefox-%%A\shell\open\command /VE /D "\"%InstallDir%\%Prog%.exe\" -osint -url \"%%1\"" /F
-		copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old"
+                copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old"
-		xml ed -d /DefaultAssociations/Association[@Identifier='%%A'] "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml"
+                xml ed -d /DefaultAssociations/Association[@Identifier='%%A'] "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml"
-		copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old"
+                copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old"
-		xml ed -s /DefaultAssociations -t elem -n Association_new -v "" -i /DefaultAssociations/Association_new -t attr -n Identifier -v %%A -i /DefaultAssociations/Association_new -t attr -n ProgId -v FirefoxURL -i /DefaultAssociations/Association_new -t attr -n ApplicationName -v "Firefox" -r "/DefaultAssociations/Association_new" -v Association "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml"
+                xml ed -s /DefaultAssociations -t elem -n Association_new -v "" -i /DefaultAssociations/Association_new -t attr -n Identifier -v %%A -i /DefaultAssociations/Association_new -t attr -n ProgId -v FirefoxURL -i /DefaultAssociations/Association_new -t attr -n ApplicationName -v "Firefox" -r "/DefaultAssociations/Association_new" -v Association "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml"
-  	)
+        )
 )
 
 rem Set Default Associations for Windows 8
 move "$LogDir$\defaultassociations.xml" "%System%"
 REG ADD HKLM\Software\Policies\Microsoft\Windows\System /V DefaultAssociationsConfiguration /D "%System%\defaultassociations.xml" /F
 
-[Winbatch_install]
+[Winbatch_install_32]
 REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 /f
-"$InstallExe$" -ms
+"$Install32Exe$" -ms
 "%ProgramFiles32Dir%\Mozilla Maintenance Service\uninstall.exe" /S
 
-[Files_install]
+[Files_install_32]
 ; copy the ini file to the InstallDir
-copy "$IniCfgFile$" "$InstallDir$"
+copy "$IniCfgFile$" "$InstallDir32$"
-copy "%ScriptPath%\*.cfg" "$InstallDir$"
+copy "%ScriptPath%\*.cfg" "$InstallDir32$"
-copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref"
+copy "%ScriptPath%\local-settings.js" "$InstallDir32$\defaults\pref"
-copy "%ScriptPath%\override.ini" "$InstallDir$\browser"
+copy "%ScriptPath%\override.ini" "$InstallDir32$\browser"
-copy -s "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles"
+copy -s "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir32$\distribution\bundles"
-copy -s "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions"
+copy -s "%ScriptPath%\ALL\Addons\bundles\*.*" "$InstallDir32$\distribution\bundles"
+copy -s "%ScriptPath%\ALL\Addons\extensions\*.*" "$InstallDir32$\extensions"
+
+; Example of recursively copying some files into the installation directory:
+;
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
+
+[Winbatch_install_64]
+REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 /f
+"$Install64Exe$" -ms
+"%ProgramFiles64Dir%\Mozilla Maintenance Service\uninstall.exe" /S
+
+[Files_install_64]
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir64$"
+copy "%ScriptPath%\*.cfg" "$InstallDir64$"
+copy "%ScriptPath%\local-settings.js" "$InstallDir64$\defaults\pref"
+copy "%ScriptPath%\override.ini" "$InstallDir64$\browser"
+copy -s "%ScriptPath%\X86_64\Addons\bundles\*.*" "$InstallDir64$\distribution\bundles"
+copy -s "%ScriptPath%\ALL\Addons\bundles\*.*" "$InstallDir64$\distribution\bundles"
+copy -s "%ScriptPath%\ALL\Addons\extensions\*.*" "$InstallDir64$\extensions"
+
+; Example of recursively copying some files into the installation directory:
+;
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:

CLIENT_DATA/uninstall3264.ins

@@ -6,18 +6,29 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
-DefVar $UninstallProgram$
+DefVar $UninstallProg32$
-DefVar $UninstallProgramOld$
+DefVar $UninstallProgram32$
-DefVar $IniFile$
+DefVar $UninstallProgramOld32$
+DefVar $IniFile32$
+DefVar $UninstallProg64$
+DefVar $UninstallProgram64$
+DefVar $UninstallProgramOld64$
+DefVar $IniFile64$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
-DefVar $InstallDir$
+DefVar $InstallDir32$
+DefVar $InstallDir64$
+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
@@ -33,7 +44,8 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir$      = "%ProgramFiles32Dir%\Mozilla Firefox"
+Set $InstallDir32$    = "%ProgramFiles32Dir%\Mozilla Firefox"
+Set $InstallDir64$    = "%ProgramFiles64Dir%\Mozilla Firefox"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -43,8 +55,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
-if FileExists("%ScriptPath%\delsub32.ins")
+if FileExists("%ScriptPath%\delsub3264.ins")
 	comment "Start uninstall sub section"
-	Sub "%ScriptPath%\delsub32.ins"
+	Sub "%ScriptPath%\delsub3264.ins"
 endif
 

Firefox-Setup-48.0.exe.sha1sum

@@ -1 +0,0 @@
-f85a74c74c48ecdd2b5c11cb6afc653b4ad7cb1e  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/Firefox-Setup-48.0.exe

Firefox-Setup-win32-48.0.2.exe.sha1sum

@@ -0,0 +1 @@
+bbdbb9b0b3a35e4f355fca4735826fd1d78706c3  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/X86/Firefox-Setup-win32-48.0.2.exe

Firefox-Setup-win64-48.0.2.exe.sha1sum

@@ -0,0 +1 @@
+9f96013fa4783e778a22d3a4577af213f5de48cc  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/X86_64/Firefox-Setup-win64-48.0.2.exe

OPSI/control

@@ -13,8 +13,8 @@ version: VERSION
 priority: PRIORITY
 licenseRequired: False
 productClasses: 
-setupScript: setup32.ins
+setupScript: setup3264.ins
-uninstallScript: uninstall32.ins
+uninstallScript: uninstall3264.ins
 updateScript: 
 alwaysScript: 
 onceScript: 

builder-product.cfg

@@ -4,8 +4,8 @@
 VENDOR="mozilla.org"
 PN="mozilla.firefox.be"
 NAME="Mozilla Firefox"
-DESCRIPTION="Mozilla Firefox ist ein freier Webbrowser des Mozilla-Projekts."
+DESCRIPTION="Mozilla Firefox ist ein freier Webbrowser des Mozilla-Projekts. "
-VERSION="48.0"
+VERSION="48.0.2"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -17,76 +17,91 @@ TYPE="public"
 DL_FILE[0]="firefox-512-noshadow.png"
 DL_SOURCE[0]="http://people.mozilla.org/~faaborg/files/shiretoko/firefoxIcon/firefox-512-noshadow.png"
 
-DL_FILE[1]="Firefox-Setup-${VERSION}.exe"
+DL_FILE[1]="Firefox-Setup-win32-${VERSION}.exe"
 DL_SOURCE[1]="http://ftp.mozilla.org/pub/firefox/releases/${VERSION}/win32/de/Firefox%20Setup%20${VERSION}.exe"
 DL_ARCH[1]="X86"
-DL_WINST_NAME[1]=InstallExe
+DL_WINST_NAME[1]=Install32Exe
 
-DL_FILE[2]="vlc-plugin@videolan.org.xpi"
+DL_FILE[2]="Firefox-Setup-win64-${VERSION}.exe"
-DL_SOURCE[2]="http://download.videolan.org/pub/videolan/vlc/2.2.4/win32/vlc-2.2.4-win32.xpi"
+DL_SOURCE[2]="http://ftp.mozilla.org/pub/firefox/releases/${VERSION}/win64/de/Firefox%20Setup%20${VERSION}.exe"
-DL_ARCH[2]="X86"
+DL_ARCH[2]="X86_64"
-DL_EXTRACT_TO[2]="Addons/bundles"
+DL_WINST_NAME[2]=Install64Exe
-DL_WINST_NAME[2]=VideolanClientXpi
 
-DL_FILE[3]="{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi"
+DL_FILE[3]="vlc-plugin@videolan.org.xpi32"
-DL_SOURCE[3]="https://addons.mozilla.org/firefox/downloads/latest/1865/addon-1865-latest.xpi"
+DL_SOURCE[3]="http://download.videolan.org/pub/videolan/vlc/2.2.4/win32/vlc-2.2.4-win32.xpi"
 DL_ARCH[3]="X86"
 DL_EXTRACT_TO[3]="Addons/bundles"
-DL_WINST_NAME[3]=AdblockPlusXpi
+DL_WINST_NAME[3]=VideolanClientXpi32
 
-DL_FILE[4]="firefox@ghostery.com.xpi"
+DL_FILE[4]="vlc-plugin@videolan.org.xpi64"
-DL_SOURCE[4]="https://addons.mozilla.org/firefox/downloads/latest/9609/addon-9609-latest.xpi"
+DL_SOURCE[4]="http://download.videolan.org/pub/videolan/vlc/2.2.4/win64/vlc-2.2.4-win64.xpi"
-DL_ARCH[4]="X86"
+DL_ARCH[4]="X86_64"
 DL_EXTRACT_TO[4]="Addons/bundles"
-DL_WINST_NAME[4]=GhosteryXpi
+DL_WINST_NAME[4]=VideolanClientXpi64
 
-DL_FILE[5]="fastdial@telega.phpnet.us.xpi"
+DL_FILE[5]="{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi"
-DL_SOURCE[5]="http://www.userlogos.org/files/fastdial-4.12-fx.xpi"
+DL_SOURCE[5]="https://addons.mozilla.org/firefox/downloads/latest/1865/addon-1865-latest.xpi"
-DL_ARCH[5]="X86"
+DL_ARCH[5]="ALL"
 DL_EXTRACT_TO[5]="Addons/bundles"
-DL_WINST_NAME[5]=FastDialXpi
+DL_WINST_NAME[5]=AdblockPlusXpi
 
-DL_FILE[6]="{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi"
+DL_FILE[6]="firefox@ghostery.com.xpi"
-DL_SOURCE[6]="https://addons.mozilla.org/firefox/downloads/latest/684/addon-684-latest.xpi"
+DL_SOURCE[6]="https://addons.mozilla.org/firefox/downloads/latest/9609/addon-9609-latest.xpi"
-DL_ARCH[6]="X86"
+DL_ARCH[6]="ALL"
 DL_EXTRACT_TO[6]="Addons/bundles"
-DL_WINST_NAME[6]=FireFtpXpi
+DL_WINST_NAME[6]=GhosteryXpi
 
-DL_FILE[7]="{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi"
+DL_FILE[7]="fastdial@telega.phpnet.us.xpi"
-DL_SOURCE[7]="https://addons.mozilla.org/firefox/downloads/latest/5791/addon-5791-latest.xpi"
+DL_SOURCE[7]="http://www.userlogos.org/files/fastdial-4.12-fx.xpi"
-DL_ARCH[7]="X86"
+DL_ARCH[7]="ALL"
 DL_EXTRACT_TO[7]="Addons/bundles"
-DL_WINST_NAME[7]=FlagFoxXpi
+DL_WINST_NAME[7]=FastDialXpi
 
-DL_FILE[8]="{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi"
+DL_FILE[8]="{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi"
-DL_SOURCE[8]="https://addons.mozilla.org/firefox/downloads/latest/92382/platform:5/addon-92382-latest.xpi"
+DL_SOURCE[8]="https://addons.mozilla.org/firefox/downloads/latest/684/addon-684-latest.xpi"
-DL_ARCH[8]="X86"
+DL_ARCH[8]="ALL"
 DL_EXTRACT_TO[8]="Addons/bundles"
-DL_WINST_NAME[8]=IeTabV2Xpi
+DL_WINST_NAME[8]=FireFtpXpi
 
-DL_FILE[9]="{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi"
+DL_FILE[9]="{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi"
-DL_SOURCE[9]="https://addons.mozilla.org/firefox/downloads/latest/26/addon-26-latest.xpi"
+DL_SOURCE[9]="https://addons.mozilla.org/firefox/downloads/latest/5791/addon-5791-latest.xpi"
-DL_ARCH[9]="X86"
+DL_ARCH[9]="ALL"
-DL_EXTRACT_TO[9]="Addons/extensions"
+DL_EXTRACT_TO[9]="Addons/bundles"
-DL_WINST_NAME[9]=DownloadStatusBarXpi
+DL_WINST_NAME[9]=FlagFoxXpi
 
-DL_FILE[10]="{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi"
+DL_FILE[10]="{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi"
-DL_SOURCE[10]="https://addons.mozilla.org/firefox/downloads/latest/748/addon-748-latest.xpi"
+DL_SOURCE[10]="https://addons.mozilla.org/firefox/downloads/latest/92382/platform:5/addon-92382-latest.xpi"
-DL_ARCH[10]="X86"
+DL_ARCH[10]="ALL"
-DL_EXTRACT_TO[10]="Addons/extensions"
+DL_EXTRACT_TO[10]="Addons/bundles"
-DL_WINST_NAME[10]=GreasmonkeyXpi
+DL_WINST_NAME[10]=IeTabV2Xpi
+
+DL_FILE[11]="{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi"
+DL_SOURCE[11]="https://addons.mozilla.org/firefox/downloads/latest/26/addon-26-latest.xpi"
+DL_ARCH[11]="ALL"
+DL_EXTRACT_TO[11]="Addons/extensions"
+DL_WINST_NAME[11]=DownloadStatusBarXpi
+
+DL_FILE[12]="{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi"
+DL_SOURCE[12]="https://addons.mozilla.org/firefox/downloads/latest/748/addon-748-latest.xpi"
+DL_ARCH[12]="ALL"
+DL_EXTRACT_TO[12]="Addons/extensions"
+DL_WINST_NAME[12]=GreasmonkeyXpi
 
 # 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_OPTION[0]="UninstallProg32"
 OPSI_INI_VALUE[0]="uninstall\helper.exe"
 
-OPSI_INI_SECTION[1]="X86"
+OPSI_INI_SECTION[1]="X86_64"
-OPSI_INI_OPTION[1]="Prog32"
+OPSI_INI_OPTION[1]="UninstallProg64"
-OPSI_INI_VALUE[1]="firefox.exe"
+OPSI_INI_VALUE[1]="uninstall\helper.exe"
 
-OPSI_INI_SECTION[2]="X86_64"
+OPSI_INI_SECTION[2]="X86"
-OPSI_INI_OPTION[2]="Prog64"
+OPSI_INI_OPTION[2]="Prog32"
 OPSI_INI_VALUE[2]="firefox.exe"
+
+OPSI_INI_SECTION[3]="X86_64"
+OPSI_INI_OPTION[3]="Prog64"
+OPSI_INI_VALUE[3]="firefox.exe"

builder-targets-cb.sh

@@ -28,29 +28,63 @@ function create() {
     echo "Create"
     builder_create
 
+	### X86
 	mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/bundles
 #	mv  $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/bundles
 	
 	pushd $INST_DIR/CLIENT_DATA/X86/Addons/bundles
-	for file in `ls *.xpi`
+	for file in `ls *.xpi*`
 	do
-	    dirname=`echo $file|sed 's/\.xpi$//g'`
+	    dirname=`echo $file|sed 's/\.xpi.*$//g'`
+	    echo $dirname
 	    mkdir $dirname
 	    7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/bundles/$file
 	done
 	popd
-	rm  $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi
+	rm  $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi*
 	
-	mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/extensions
+	### X86_64
-#	mv  $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/extensions
+	mkdir -p $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles
-
+#	mv  $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/*.xpi $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles
-	pushd $INST_DIR/CLIENT_DATA/X86/Addons/extensions
+	
-	for file in `ls *.xpi`
+	pushd $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles
+	for file in `ls *.xpi*`
 	do
-	    dirname=`echo $file|sed 's/\.xpi$//g'`
+	    dirname=`echo $file|sed 's/\.xpi.*$//g'`
+	    echo $dirname
 	    mkdir $dirname
-	    7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/extensions/$file
+	    7z x -o$INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/$file
 	done
 	popd
-	rm  $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi
+	rm  $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/*.xpi*
+	
+	### ALL
+	mkdir -p $INST_DIR/CLIENT_DATA/ALL/Addons/bundles
+#	mv  $INST_DIR/CLIENT_DATA/ALL/Addons/bundles/*.xpi $INST_DIR/CLIENT_DATA/ALL/Addons/bundles
+	
+	pushd $INST_DIR/CLIENT_DATA/ALL/Addons/bundles
+	for file in `ls *.xpi*`
+	do
+	    dirname=`echo $file|sed 's/\.xpi.*$//g'`
+	    echo $dirname
+	    mkdir $dirname
+	    7z x -o$INST_DIR/CLIENT_DATA/ALL/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/ALL/Addons/bundles/$file
+	done
+	popd
+	rm  $INST_DIR/CLIENT_DATA/ALL/Addons/bundles/*.xpi*
+	
+	### Extensions
+	mkdir -p $INST_DIR/CLIENT_DATA/ALL/Addons/extensions
+#	mv  $INST_DIR/CLIENT_DATA/ALL/Addons/extensions/*.xpi $INST_DIR/CLIENT_DATA/ALL/Addons/extensions
+
+	pushd $INST_DIR/CLIENT_DATA/ALL/Addons/extensions
+	for file in `ls *.xpi*`
+	do
+	    dirname=`echo $file|sed 's/\.xpi.*$//g'`
+	    echo $dirname
+	    mkdir $dirname
+	    7z x -o$INST_DIR/CLIENT_DATA/ALL/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/ALL/Addons/extensions/$file
+	done
+	popd
+	rm  $INST_DIR/CLIENT_DATA/ALL/Addons/extensions/*.xpi*
 }

fastdial@telega.phpnet.us.xpi.sha1sum

@@ -1 +1 @@
-dcb8eb95d8e33336fd3af94bf361545203413872  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/fastdial@telega.phpnet.us.xpi
+dcb8eb95d8e33336fd3af94bf361545203413872  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/fastdial@telega.phpnet.us.xpi

firefox-512-noshadow.png.sha1sum

@@ -1 +1 @@
-42f191b9c2057badee22570dccb3bad353049654  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0//firefox-512-noshadow.png
+42f191b9c2057badee22570dccb3bad353049654  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2//firefox-512-noshadow.png

firefox@ghostery.com.xpi.sha1sum

@@ -1 +1 @@
-b50aad5b3fb252b910303273ad012d5dc847792e  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/firefox@ghostery.com.xpi
+d1b42b9db3756f5a6d79ddf2f9c9e60c8ab66bab  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/firefox@ghostery.com.xpi

vlc-plugin@videolan.org.xpi.sha1sum

@@ -1 +0,0 @@
-780a95b3684f08bf48ad4b5606ebad230d39a117  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/vlc-plugin@videolan.org.xpi

vlc-plugin@videolan.org.xpi32.sha1sum

@@ -0,0 +1 @@
+780a95b3684f08bf48ad4b5606ebad230d39a117  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/X86/vlc-plugin@videolan.org.xpi32

vlc-plugin@videolan.org.xpi64.sha1sum

@@ -0,0 +1 @@
+20abd99fde4b38a87013b887202ddbfaa2c89acb  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/X86_64/vlc-plugin@videolan.org.xpi64

{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum

@@ -1 +1 @@
-fad1e36f12977775b5fce3ad4898a3299ddf9cbd  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi
+d7ca338ce01eb6cee21d464f43cc1f9a058abe58  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi

{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum

@@ -1 +1 @@
-24afdaa2da1603b2e08c51b531f684f574f52ead  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi
+24afdaa2da1603b2e08c51b531f684f574f52ead  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi

{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum

@@ -1 +1 @@
-615b4e8208cc40be8fbf1bd4dadedf0c24054c56  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi
+615b4e8208cc40be8fbf1bd4dadedf0c24054c56  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi

{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum

@@ -1 +1 @@
-c0760c18494dbd6d80961d30b0339774e7374702  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi
+c0760c18494dbd6d80961d30b0339774e7374702  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi

{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum

@@ -1 +1 @@
-63402bb90dc1ede07448f8b0b566051ba43d8483  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi
+63402bb90dc1ede07448f8b0b566051ba43d8483  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi

{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum

@@ -1 +1 @@
-4886b357f1470a21b5fdf936da67f8e2f972c74e  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0/X86/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi
+b335049e0bbef198a29414fc1b37e245ba898b7e  /home/mario/.opsi-dist-cache/mozilla.firefox.be-48.0.2/ALL/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi