From 16feb1c45333af29ea44ab0802f4291e2029b6e4 Mon Sep 17 00:00:00 2001 From: Peter Singer Date: Mon, 6 May 2013 13:18:33 +0200 Subject: [PATCH] Fixed uninstall bug, new handling for Add Ons and stops "first run" messages --- CLIENT_DATA/delsub32.ins | 4 ++-- CLIENT_DATA/setup32.ins | 4 ++-- builder-product.cfg | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 3549085..22b405a 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -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 diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 717195d..d853e99 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -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" diff --git a/builder-product.cfg b/builder-product.cfg index 22c9bcc..e414266 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -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