[tor-commits] [tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 15406: Do not force updates for Torbutton and Tor Launcher.

[mikeperry at torproject.org]

commit 74d1e1309dd53363481140d463edae3a905cea97
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Mar 24 11:12:35 2015 -0400

    Bug 15406: Do not force updates for Torbutton and Tor Launcher.
    
    Since we have disabled updates for Torbutton and Tor Launcher, there
    is no need to force these extensions to be updated (replaced) when
    generating our incremental MAR files.  Also, we no longer force an update
    to the pdf.js extension (it is now built into the browser) or to the
    firefox binary on Mac OS (Mozilla forces firefox to be replaced on Mac OS
    due to code signing / signature issues with partner builds; see
    https://bugzilla.mozilla.org/show_bug.cgi?id=770996).
---
 tools/update-packaging/make_incremental_update.sh |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh
index 60c5a4b..010101c 100755
--- a/tools/update-packaging/make_incremental_update.sh
+++ b/tools/update-packaging/make_incremental_update.sh
@@ -69,18 +69,12 @@ if [ $# = 0 ]; then
   exit 1
 fi
 
-# The last .xpi is NoScript.
-ext_path='TorBrowser/Data/Browser/profile.default/extensions';
-# TODO: it would be better to pass this as a command line option.
-exts='https-everywhere at eff.org/* tor-launcher at torproject.org.xpi torbutton at torproject.org.xpi uriloader at pdf.js.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi'
-requested_forced_updates='Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox'
-for ext in $exts; do
-  requested_forced_updates="$requested_forced_updates $ext_path/$ext"
-done
-
-
-# TODO: it would be better to pass this as a command line option.
-directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere at eff.org'
+# TODO: it would be better to pass these paths via command line options.
+ext_path='TorBrowser/Data/Browser/profile.default/extensions'
+https_everywhere='https-everywhere at eff.org'
+noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi'
+requested_forced_updates="$ext_path/$https_everywhere/* $ext_path/$noscript"
+directories_to_remove="$ext_path/$https_everywhere"
 
 while getopts "hqf:" flag
 do