Fixed uninstall bug, new handling for Add Ons and stops "first run" messages

This commit is contained in:
Peter Singer 2013-05-06 13:18:33 +02:00
parent 33408115ea
commit 16feb1c453
3 changed files with 4 additions and 5 deletions

View File

@ -19,13 +19,13 @@ if FileExists($IniFile$)
Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
if FileExists($UninstallProgramOld$)
comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old
Winbatch_uninstall_old /WaitforProcessending "Au_.exe" /Timeoutseconds 300
sub_check_exitcode
endif
endif
if FileExists($UninstallProgram$)
comment "Uninstall program found, starting uninstall"
Winbatch_uninstall
Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 300
sub_check_exitcode
endif

View File

@ -86,8 +86,8 @@ REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1
copy "$IniCfgFile$" "$InstallDir$"
copy "%ScriptPath%\*.cfg" "$InstallDir$"
copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref"
copy "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles"
copy "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions"
copy -s "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles"
copy -s "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions"
del "$InstallDir$\distribution\extensions\tbtestpilot@labs.mozilla.com.xpi"

View File

@ -25,7 +25,6 @@ DL_WINST_NAME[1]=InstallExe
DL_FILE[2]="{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi"
DL_SOURCE[2]="https://addons.cdn.mozilla.net/_files/_attachments/2313/lightning-1.9.1-sm+tb-windows.xpi"
DL_ARCH[2]="X86"
# DL_EXTRACT_FORMAT[2]="cp"
DL_EXTRACT_TO[2]="Addons/bundles"
DL_WINST_NAME[2]=LightningPluginXpi