removed 64bit browser support, added flash plugin (i.e. for firefox)

CLIENT_DATA/delsub32.ins

@@ -0,0 +1,58 @@
+; -*-Text-*-
+
+DefVar $MacromedPathPlugin$
+DefVar $MacromedPathActiveX$
+
+Set $MacromedPathPlugin$ = "%System%\Macromed\Flash\NPSWF32_17_0_0_188.dll"
+Set $MacromedPathActiveX$ = "%System%\Macromed\Flash\FlashUtil32_17_0_0_188_ActiveX.dll"
+
+if FileExists($MacromedPathActiveX$)
+   Message "Uninstalling " + $ProductId$ + " Flash Active X..."
+   Winbatch_uninstall_ax
+   Sub_check_exitcode
+endif
+
+if FileExists($MacromedPathPlugin$)
+   Message "Uninstalling " + $ProductId$ + " Flash Plugin..."
+   Winbatch_uninstall_pl
+   Sub_check_exitcode
+endif
+
+[Winbatch_uninstall_ax]
+; === MSI package =======================================================================================
+msiexec /x "$InstallActiveX$" /quiet
+
+[Winbatch_uninstall_pl]
+; === MSI package =======================================================================================
+msiexec /x "$InstallPlugin$" /quiet
+
+
+[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

@@ -1,139 +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/credits/
-
-
-Set $MsiId32$ = '{E7C06D29-B16A-4D88-A917-55422FAB4E9D}'
-Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
-
-Set $MsiId64$ = '{8D7DDFA2-3A50-49A4-99C5-6D8BE66FE0B9}'
-Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe"
-
-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($UninstallProgram32$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32
-		sub_check_exitcode
-	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
-		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"))
-	Message "Uninstalling " + $ProductId$ + " 64 Bit..."
-
-	if FileExists($UninstallProgram64$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64
-		sub_check_exitcode
-	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
-		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_32]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; "$UninstallProgram32$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES
-
-
-[Winbatch_uninstall_msi_32]
-msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
-
-[Files_uninstall_32]
-; Example for recursively deleting the installation directory (don't forget the trailing backslash):
-;
-; delete -sf "$InstallDir32$\"
-
-[Winbatch_uninstall_64]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; "$UninstallProgram64$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES
-
-
-[Winbatch_uninstall_msi_64]
-msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
-
-[Files_uninstall_64]
-; Example for recursively deleting the installation directory (don't forget the trailing backslash):
-;
-; delete -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/setup32.ins

@@ -0,0 +1,101 @@
+; -*-Text-*-
+
+[Actions]
+requiredWinstVersion >= "4.10.8.6"
+
+DefVar $LogDir$
+DefVar $ProductId$  
+DefVar $MinimumSpace$
+DefVar $ExitCode$
+
+Set $LogDir$ = "%SystemDrive%\tmp"
+
+; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+; and adds the following variables:
+;   from builder-product.cfg :  all variables definded by attribute WINST[index]
+;   from builder-product.cfg :  VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE   
+;   from opsi-builder.cfg    :  CREATOR_TAG CREATOR_NAME CREATOR_EMAIL           
+;   auto generated winst-variables
+;         $IconFile$: path to product picture
+;
+@@BUILDER_VARIABLES@@
+
+; ----------------------------------------------------------------
+; - Please edit the following values                             -
+; ----------------------------------------------------------------
+;$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.flashplayer"
+Set $MinimumSpace$    = "1 MB"
+; ----------------------------------------------------------------
+
+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$
+	
+	if FileExists("%ScriptPath%\delsub32.ins")
+		comment "Start uninstall sub section"
+		Sub "%ScriptPath%\delsub32.ins"
+	endif
+	
+	comment "installing"
+
+; === Active X Installation =======================================================================================        
+	Message "Installing " + $ProductId$ + " Flash Active X..."
+	comment "Start setup program"
+	Winbatch_install_ax
+	Sub_check_exitcode
+	
+
+; === Plugin Installation  ========================================================================================
+        if FileExists("%ProgramFiles32Dir%\Mozilla Firefox\firefox.exe")
+		Message "Installing " + $ProductId$ + " Flash Plugin..."
+		comment "Start setup program"
+		Winbatch_install_pl
+		Sub_check_exitcode
+	endif
+	
+endif
+
+[Winbatch_install_ax]
+; === MSI package =======================================================================================
+msiexec /i "$InstallActiveX$" /quiet
+
+
+[Winbatch_install_pl]
+; === MSI package =======================================================================================
+msiexec /i "$InstallPlugin$" /quiet
+
+[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

@@ -1,111 +0,0 @@
-; 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/
-
-[Actions]
-requiredWinstVersion >= "4.10.8.6"
-
-DefVar $MsiId32$
-DefVar $UninstallProgram32$
-DefVar $MsiId64$
-DefVar $UninstallProgram64$
-DefVar $LogDir$
-DefVar $ProductId$  
-DefVar $MinimumSpace$
-DefVar $InstallDir32$
-DefVar $InstallDir64$
-DefVar $ExitCode$
-DefVar $LicenseRequired$
-DefVar $LicenseKey$
-DefVar $LicensePool$
-DefVar $INST_SystemType$
-DefVar $INST_architecture$
-
-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
-; and adds the following variables:
-;   from builder-product.cfg :  all variables definded by attribute WINST[index]
-;   from builder-product.cfg :  VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE   
-;   from opsi-builder.cfg    :  CREATOR_TAG CREATOR_NAME CREATOR_EMAIL           
-;   auto generated winst-variables
-;         $IconFile$: path to product picture
-;
-@@BUILDER_VARIABLES@@
-
-; ----------------------------------------------------------------
-; - Please edit the following values                             -
-; ----------------------------------------------------------------
-;$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$       = "adobeflash"
-Set $MinimumSpace$    = "1 MB"
-; the path were we find the product after the installation
-Set $InstallDir32$      = "%ProgramFiles32Dir%\<path to the product>"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\<path to the product>"
-Set $LicenseRequired$ = "false"
-Set $LicensePool$     = "p_" + $ProductId$
-; ----------------------------------------------------------------
-
-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$
-	
-	if FileExists("%ScriptPath%\delsub3264.ins")
-		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub3264.ins"
-	endif
-	
-	if $LicenseRequired$ = "true"
-		comment "Licensing required, reserve license and get license key"
-		Sub_get_licensekey
-	endif
-	
-	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..."
-		comment "Start setup program"
-		Winbatch_install_32
-		Sub_check_exitcode
-		comment "Copy files"
-		Files_install_32 /32Bit
-		comment "Patch Registry"
-		Registry_install /32Bit
-		comment "Create shortcuts"
-		LinkFolder_install
-	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..."
-		comment "Start setup program"
-		Winbatch_install_64
-		Sub_check_exitcode
-		comment "Copy files"
-		Files_install_64 /64Bit
-		comment "Patch Registry"
-		Registry_install /64Bit
-		comment "Create shortcuts"
-		LinkFolder_install
-	endif
-	
-endif
-
-[Winbatch_install_32]
-; === MSI package =======================================================================================
-msiexec /i "$Install32Exe$" /qb-!
-
-
-[Winbatch_install_64]
-; === MSI package =======================================================================================
-msiexec /i "$Install64Exe$" /qb-!

CLIENT_DATA/uninstall32.ins

@@ -0,0 +1,44 @@
+; 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/
+
+[Actions]
+requiredWinstVersion >= "4.10.8.6"
+
+DefVar $LogDir$
+DefVar $ExitCode$
+DefVar $ProductId$
+
+Set $LogDir$ = "%SystemDrive%\tmp"
+
+; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+; and adds the following variables:
+;   from builder-product.cfg :  all variables definded by attribute WINST[index]
+;   from builder-product.cfg :  VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE   
+;   from opsi-builder.cfg    :  CREATOR_TAG CREATOR_NAME CREATOR_EMAIL           
+;   auto generated winst-variables
+;         $IconFile$: path to product picture
+;
+@@BUILDER_VARIABLES@@
+
+; ----------------------------------------------------------------
+; - Please edit the following values                             -
+; ----------------------------------------------------------------
+Set $ProductId$       = "adobe.flashplayer"
+; ----------------------------------------------------------------
+
+comment "Show product picture"
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+
+Message "Uninstalling " + $ProductId$ + " ..."
+
+if FileExists("%ScriptPath%\delsub32.ins")
+	comment "Start uninstall sub section"
+	Sub "%ScriptPath%\delsub32.ins"
+endif
+
+
+
+
+

CLIENT_DATA/uninstall3264.ins

@@ -1,79 +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/credits/
-
-[Actions]
-requiredWinstVersion >= "4.10.8.6"
-
-DefVar $MsiId32$
-DefVar $UninstallProgram32$
-DefVar $MsiId64$
-DefVar $UninstallProgram64$
-DefVar $LogDir$
-DefVar $ExitCode$
-DefVar $ProductId$
-DefVar $InstallDir32$
-DefVar $InstallDir64$
-DefVar $LicenseRequired$
-DefVar $LicensePool$
-DefVar $INST_SystemType$
-DefVar $INST_architecture$
-
-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
-; and adds the following variables:
-;   from builder-product.cfg :  all variables definded by attribute WINST[index]
-;   from builder-product.cfg :  VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE   
-;   from opsi-builder.cfg    :  CREATOR_TAG CREATOR_NAME CREATOR_EMAIL           
-;   auto generated winst-variables
-;         $IconFile$: path to product picture
-;
-@@BUILDER_VARIABLES@@
-
-; ----------------------------------------------------------------
-; - Please edit the following values                             -
-; ----------------------------------------------------------------
-Set $ProductId$       = "adobeflash"
-Set $InstallDir32$    = "%ProgramFiles32Dir%\<path to the product>"
-Set $InstallDir64$    = "%ProgramFiles64Dir%\<path to the product>"
-Set $LicenseRequired$ = "false"
-Set $LicensePool$     = "p_" + $ProductId$
-; ----------------------------------------------------------------
-
-
-comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
-
-Message "Uninstalling " + $ProductId$ + " ..."
-
-if FileExists("%ScriptPath%\delsub3264.ins")
-	comment "Start uninstall sub section"
-	Sub "%ScriptPath%\delsub3264.ins"
-endif
-
-if $LicenseRequired$ = "true"
-	comment "Licensing required, free license used"
-	Sub_free_license
-endif
-
-[Sub_free_license]
-comment "License management is enabled and will be used"
-
-comment "Trying to free license used for the product"
-DefVar $result$
-Set $result$ = FreeLicense($LicensePool$)
-; If there is an assignment of a license pool to the product, it is possible to use
-; Set $result$ = FreeLicense("", $ProductId$)
-;
-; If there is an assignment of a license pool to a windows software id, it is possible to use
-; DefVar $WindowsSoftwareId$
-; $WindowsSoftwareId$ = "..."
-; set $result$ = FreeLicense("", "", $WindowsSoftwareId$)
-
-

OPSI/control

@@ -6,26 +6,17 @@ incremental: False
 [Product]
 type: localboot
 id: adobe.flashplayer
-name: Adobe Flash ActiveX
+name: "Adobe Flash Player"
-description: Adobe Flash Player fuer Internet Explorer
+description: "Adobe Flash Player fuer Internet Explorer und Firefox"
 advice: ADVICE
 version: VERSION
 priority: PRIORITY
 licenseRequired: False
 productClasses:
-setupScript: setup3264.ins
+setupScript: setup32.ins
-uninstallScript: uninstall3264.ins
+uninstallScript: uninstall32.ins
 updateScript:
 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"]

adobeflash.msi.sha1sum

@@ -1 +1 @@
-88502f35bd73a06bb631a9a86cb76e5a2333ead9  /home/dschwager/.opsi-dist-cache/adobe.com/adobe.flash/11.2.202.233/X86/adobeflash.msi
+c82369d8833b56d06468c4e0bc5b6042a138e82c  /home/dtrinks/.opsi-dist-cache/adobe.com/adobe.flashplayer/17.0.0.188/X86/adobeflash.msi

adobeflash.png.sha1sum

@@ -1 +1 @@
-de6c31550b67fe6fad20f2bcf02a72c4869f797f  /home/dschwager/.opsi-dist-cache/adobe.com/adobe.flash/11.2.202.233//adobeflash.png
+de6c31550b67fe6fad20f2bcf02a72c4869f797f  /home/dtrinks/.opsi-dist-cache/adobe.com/adobe.flashplayer/17.0.0.188//adobeflash.png

adobeflash64.msi.sha1sum

@@ -1 +0,0 @@
-96af9671325b97fdb424cd078eeb3df9f932b5c7  /home/dschwager/.opsi-dist-cache/adobe.com/adobe.flash/11.2.202.233/X86_64/adobeflash64.msi

adobeflash_p.msi.sha1sum

@@ -0,0 +1 @@
+de8c9c30b54003d453a1cb08a23f5af2f2b91026  /home/dtrinks/.opsi-dist-cache/adobe.com/adobe.flashplayer/17.0.0.188/X86/adobeflash_p.msi

builder-product.cfg

@@ -3,7 +3,8 @@
 ############################
 VENDOR="adobe.com"
 PN="adobe.flashplayer"
-VERSION="11.2.202.233"
+DESCRIPTION="Adobe Flash Player fuer Internet Explorer und Firefox"
+VERSION="17.0.0.188"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -16,14 +17,14 @@ DL_FILE[0]="adobeflash.png"
 DL_SOURCE[0]="http://www.veryicon.com/icon/png/Application/Adobe%20Symbolism%20CS3/Flash%20Player.png"
 
 DL_FILE[1]="adobeflash.msi"
-DL_SOURCE[1]="http://fpdownload.macromedia.com/pub/flashplayer/current/licensing/win/install_flash_player_11_active_x_32bit.msi"
+DL_SOURCE[1]="http://download.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_17_active_x.msi"
 DL_ARCH[1]="X86"
-DL_WINST_NAME[1]=Install32Exe
+DL_WINST_NAME[1]=InstallActiveX
 
-DL_FILE[2]="adobeflash64.msi"
+DL_FILE[2]="adobeflash_p.msi"
-DL_SOURCE[2]="http://fpdownload.macromedia.com/pub/flashplayer/current/licensing/win/install_flash_player_11_active_x_64bit.msi"
+DL_SOURCE[2]="http://download.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_17_plugin.msi"
-DL_ARCH[2]="X86_64"
+DL_ARCH[2]="X86"
-DL_WINST_NAME[2]=Install64Exe
+DL_WINST_NAME[2]=InstallPlugin
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0