Permalink
Browse files

fix merge conflict

  • Loading branch information...
2 parents dddce6c + 42b0411 commit dfeb304414caa1386b6362406d200efb18526248 @peterhoeg peterhoeg committed Mar 29, 2012
Showing with 15 additions and 10 deletions.
  1. +1 −0 addons/flash_mms.cfg
  2. +11 −7 adobe_flash.xml
  3. +3 −3 tools/get_stuff.rb
@@ -1 +1,2 @@
AutoUpdateDisable=1
+SilentAutoUpdateEnable=1
View
@@ -5,18 +5,21 @@
<!--
NOTES
1) We install both 32 and 64 bit on 64 bit hosts
+ 2) http://helpx.adobe.com/flash-player/kb/administration-configure-auto-update-notification.html
-->
<package
id="flash"
name="Adobe Flash Player"
- revision="%version%-0"
+ revision="%version%-1"
reboot="false"
priority="10">
<variable name="mainversion" value="11" />
- <variable name="shortversion" value="%mainversion%.1" />
- <variable name="version" value="%shortversion%.102.63" />
+ <variable name="shortversion" value="%mainversion%.2" />
+ <variable name="version" value="%shortversion%.202.228" />
+ <variable name='CFG_DESTINATION_32' value='%WINDIR%\system32\Macromed\Flash' />
+ <variable name='CFG_DESTINATION_64' value='%WINDIR%\SysWOW64' />
<check type='logical' condition='or'>
<check type='logical' condition='and'>
@@ -30,12 +33,13 @@
</check>
<install include='kill' />
- <install cmd='%COMSPEC% /c IF NOT EXIST "%WINDIR%\system32\Macromed\Flash" mkdir "%WINDIR%\system32\Macromed\Flash"' />
- <install cmd='%COMSPEC% /c IF EXIST "%SOFTWARE%\Adobe\Flash\mms.cfg" copy /y /v "%SOFTWARE%\Adobe\Flash\mms.cfg" "%WINDIR%\system32\Macromed\Flash\"' />
+ <install cmd='%COMSPEC% /c IF NOT EXIST "%CFG_DESTINATION_32%" mkdir "%CFG_DESTINATION_32%"' />
+ <install cmd='%COMSPEC% /c IF EXIST "%SOFTWARE%\Adobe\Flash\mms.cfg" copy /y /v "%SOFTWARE%\Adobe\Flash\mms.cfg" "%CFG_DESTINATION_32%"' />
+ <install cmd='%COMSPEC% /c IF EXIST "%SOFTWARE%\Adobe\Flash\mms.cfg" copy /y /v "%SOFTWARE%\Adobe\Flash\mms.cfg" "%CFG_DESTINATION_64%"' architecture='x64' />
<install cmd='msiexec %MSI% /i "%SOFTWARE%\Adobe\Flash\%shortversion%\%PROCESSOR_ARCHITECTURE%\install_flash_player_11_active_x.msi"' />
<install cmd='msiexec %MSI% /i "%SOFTWARE%\Adobe\Flash\%shortversion%\%PROCESSOR_ARCHITECTURE%\install_flash_player_11_plugin.msi"' />
<install cmd='msiexec %MSI% /i "%SOFTWARE%\Adobe\Flash\%shortversion%\x86\install_flash_player_11_active_x.msi"' architecture="x64"/>
- <install cmd='msiexec %MSI% /i "%SOFTWARE%\Adobe\Flash\%shortversion%\x86\install_flash_player_11_plugin.msi"' architecture="x64"/>
+ <install cmd='msiexec %MSI% /i "%SOFTWARE%\Adobe\Flash\%shortversion%\x86\install_flash_player_11_plugin.msi"' architecture="x64"/>
<upgrade include='install' />
<downgrade include='install' />
@@ -44,7 +48,7 @@
<remove cmd='msiexec %MSI% /x "%SOFTWARE%\Adobe\Flash\%shortversion%\%PROCESSOR_ARCHITECTURE%\install_flash_player_11_active_x.msi"' />
<remove cmd='msiexec %MSI% /x "%SOFTWARE%\Adobe\Flash\%shortversion%\%PROCESSOR_ARCHITECTURE%\install_flash_player_11_plugin.msi"' />
<remove cmd='msiexec %MSI% /x "%SOFTWARE%\Adobe\Flash\%shortversion%\x86\install_flash_player_11_active_x.msi"' architecture="x64"/>
- <remove cmd='msiexec %MSI% /x "%SOFTWARE%\Adobe\Flash\%shortversion%\x86\install_flash_player_11_plugin.msi"' architecture="x64"/>
+ <remove cmd='msiexec %MSI% /x "%SOFTWARE%\Adobe\Flash\%shortversion%\x86\install_flash_player_11_plugin.msi"' architecture="x64"/>
<remove cmd='%COMSPEC% /c del /s /q "%WINDIR%\system32\Macromed\Flash\mms.cfg"' >
<exit code="0" />
<exit code="1" />
View
@@ -453,7 +453,7 @@ class AppError < StandardError ; end
end
def replace_variables(str)
- s = str.gsub('%version%', @version.to_s)
+ s = str.gsub(/%version%/i, @version.to_s)
s.gsub!('%mainversion%', @mainversion.to_s)
s.gsub!('%shortversion%', @shortversion.to_s)
s.gsub!('%fileversion%', @fileversion.to_s)
@@ -472,10 +472,10 @@ def download(package_def)
if p[:package_id]
[ @xmlpath ].flatten.each do |xp|
Dir.glob(File.join(xp, '*.xml')).sort.each do |xf|
- # puts "Processing: #{xf}"
+ # puts "Processing: #{xf}"
xml = XmlSimple.xml_in(xf, {'KeyAttr' => {'package' => 'id', 'variable' => 'name'}})
if xml['package'] && xml['package'][p[:package_id]] && xml['package'][p[:package_id]]['variable'] && @version.nil?
- # we should create a hash of found variables and automatically substitute them all
+ # we should create a hash of found variables and automatically substitute them all
@version = get_variable(xml, p[:package_id], 'version')
@shortversion = get_variable(xml, p[:package_id], 'shortversion')
@mainversion = get_variable(xml, p[:package_id], 'mainversion')

0 comments on commit dfeb304

Please sign in to comment.