Code

Changeset 5b2266 in mozilla.firefox


Ignore:
Timestamp:
05/07/2013 03:08:03 PM (7 years ago)
Author:
silc
Branches:
master
Children:
8e49f0
Parents:
05aa7c
git-author:
Peter Singer <silc@…> (05/07/2013 03:08:03 PM)
git-committer:
Peter Singer <silc@…> (05/07/2013 03:08:03 PM)
Message:

Updated associations for Windows 8 and removed 32/64 bit script difference

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • CLIENT_DATA/setup32.ins

    r07c365 r5b2266  
    2020DefVar $OLD_RELEASE$ 
    2121 
     22; DefVar        $InstallDir$ 
     23DefVar  $ProgExe$ 
     24 
    2225Set $LogDir$ = "%SystemDrive%\tmp" 
    2326 
     
    6568        Sub_check_exitcode 
    6669         
     70        comment create associations 
     71;       Set $InstallDir$ = $InstallDir32$ 
     72        Set $ProgExe$ = $Prog32$ 
     73        DosInAnIcon_install winst /Sysnative 
     74         
    6775        comment "Copy files" 
    6876        Files_install /32Bit 
     
    7583         
    7684endif 
     85 
     86[DosInAnIcon_install] 
     87@echo off 
     88If exist "%System%\defaultassociations.xml" (copy "%System%\defaultassociations.xml" "$LogDir$") ELSE (copy "%ScriptPath%\defaultassociations.xml" "$LogDir$") 
     89 
     90rem Handling for X86 installation directory since Windows Vista 
     91SET InstallDir=$InstallDir$ 
     92for /f "tokens=1-3 delims=\" %%a in ("$InstallDir$") do ( 
     93set a=%%a 
     94set b=%%b 
     95set c=%%c 
     96) 
     97IF "%b%" == "Program Files (x86)" SET InstallDir=%a%^\Program Files ^^(x86^^)^\%c% 
     98 
     99SET Prog=$ProgExe$ 
     100SET Prog=%Prog:~0,-4% 
     101SET SC=HKLM\Software\Classes 
     102SET Extn=http-1 https-1 ftp-1 
     103 
     104FOR %%j IN (%Extn%) DO ( 
     105 
     106        FOR /F "tokens=1,2 delims=-" %%A IN ("%%j") DO ( 
     107                REG ADD %SC%\%%A /VE /D "Firefox-%%A" /F 
     108                REG ADD %SC%\Firefox-%%A /VE /D "%%A Firefox" /F 
     109                REG ADD %SC%\Firefox-%%A\DefaultIcon /VE /D "$InstallDir$\%Prog%.exe,%%B" /F 
     110                REG ADD %SC%\Firefox-%%A\shell\open\command /VE /D "\"%InstallDir%\%Prog%.exe\" -osint -url \"%%1\"" /F 
     111                copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old" 
     112                xml ed -d /DefaultAssociations/Association[@Identifier='%%A'] "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" 
     113                copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old" 
     114                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 Firefox-%%A -i /DefaultAssociations/Association_new -t attr -n ApplicationName -v "Mozilla Firefox" -r "/DefaultAssociations/Association_new" -v Association "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" 
     115        ) 
     116) 
     117 
     118rem Set Default Associations for Windows 8 
     119move "$LogDir$\defaultassociations.xml" "%System%" 
     120REG ADD HKLM\Software\Policies\Microsoft\Windows\System /V DefaultAssociationsConfiguration /D "%System%\defaultassociations.xml" /F 
    77121 
    78122[Winbatch_install] 
  • builder-product.cfg

    r9dfa78 r5b2266  
    3030OPSI_INI_OPTION[0]="UninstallProg" 
    3131OPSI_INI_VALUE[0]="uninstall\helper.exe" 
     32 
     33OPSI_INI_SECTION[1]="X86" 
     34OPSI_INI_OPTION[1]="Prog32" 
     35OPSI_INI_VALUE[1]="firefox.exe" 
     36 
     37OPSI_INI_SECTION[2]="X86_64" 
     38OPSI_INI_OPTION[2]="Prog64" 
     39OPSI_INI_VALUE[2]="firefox.exe" 
Note: See TracChangeset for help on using the changeset viewer.