[tor-commits] [torbrowser/maint-2.2] change the way torbutton is installed on linux since the old method no longer works

[erinn at torproject.org]

commit b9f4cc4144ea87f0dc08d6e1e9fd5b6fe8b23ef1
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Jun 12 15:34:33 2012 -0300

    change the way torbutton is installed on linux since the old method no longer works
---
 build-scripts/linux.mk |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index b122469..170916b 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -336,7 +336,7 @@ compressed-bundle_%:
 	LANGCODE=$* make -f linux.mk compressed-bundle-localized
 
 bundle-localized_%.stamp:
-	make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \
+	make -f linux.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \
 	patch-pidgin-language update-extension-pref write-tbb-version
 	touch $(STAMP_DIR)/bundle-localized_$*.stamp
 
@@ -359,7 +359,7 @@ DUMMYPROFILE=$(BUNDLE)/.mozilla/
 ## This is a little overcomplicated, but I'm keeping it here in case there are
 ## extensions we want to use in the future
 install-extensions: $(DEFAULT_EXTENSIONS)
-	for extension in *.xpi; \
+	for extension in httpseverywhere.xpi noscript.xpi; \
 		do \
 			cp $$extension $$extension.zip; \
 			ext_id=$$(unzip -p $$extension.zip install.rdf | sed -n '/<em:id>/{s#[^<]*<em:id>\(.*\)</em:id>#\1#p;q}'); \
@@ -368,6 +368,10 @@ install-extensions: $(DEFAULT_EXTENSIONS)
 			(cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \
 		done
 
+install-torbutton: torbutton.xpi
+	mkdir -p $(BUNDLE)/Data/profile/extensions/
+	cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi
+
 ## Language extensions need to be handled differently from other extensions
 install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
 ifneq ($(LANGCODE), en-US)