From 4e271aebb348cf2f329e66dbc5adae810598090d Mon Sep 17 00:00:00 2001
From: Deathamns <deathamns@gmail.com>
Date: Thu, 18 Dec 2014 10:47:14 +0100
Subject: [PATCH] Include LICENSE.txt into extension packages

---
 tools/make-chromium.sh | 4 ++++
 tools/make-firefox.sh  | 8 +++++---
 tools/make-opera.sh    | 2 ++
 tools/make-safari.sh   | 5 ++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
index ba4f9e223..d5f1c9594 100755
--- a/tools/make-chromium.sh
+++ b/tools/make-chromium.sh
@@ -4,9 +4,11 @@
 
 echo "*** uBlock.chromium: Creating web store package"
 echo "*** uBlock.chromium: Copying files"
+
 DES=dist/build/uBlock.chromium
 rm -r $DES
 mkdir -p $DES
+
 cp -R assets $DES/
 rm $DES/assets/*.sh
 cp -R src/css $DES/
@@ -18,4 +20,6 @@ cp -R $DES/_locales/nb $DES/_locales/no
 cp src/*.html $DES/
 cp platform/chromium/*.js $DES/js/
 cp platform/chromium/manifest.json $DES/
+cp LICENSE.txt $DES/
+
 echo "*** uBlock.chromium: Package done."
diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
index a959d5235..a71045d0e 100644
--- a/tools/make-firefox.sh
+++ b/tools/make-firefox.sh
@@ -3,10 +3,12 @@
 # This script assumes a linux environment
 
 echo "*** uBlock_xpi: Copying files"
+
 # use underscore instead of a dot!
 DES=dist/build/uBlock_xpi
 rm -r $DES
 mkdir -p $DES
+
 cp -R assets $DES/
 rm $DES/assets/*.sh
 cp -R src/css $DES/
@@ -15,13 +17,13 @@ cp -R src/js $DES/
 cp -R src/lib $DES/
 cp -R src/_locales $DES/
 cp src/*.html $DES/
-cp src/img/icon_128.png $DES/icon.png
+mv $DES/img/icon_128.png $DES/icon.png
 cp platform/firefox/vapi-*.js $DES/js/
 cp platform/firefox/bootstrap.js $DES/
-cp platform/firefox/frameScript.js $DES/
-cp platform/firefox/frameModule.js $DES/
+cp platform/firefox/frame*.js $DES/
 cp platform/firefox/chrome.manifest $DES/
 cp platform/firefox/install.rdf $DES/
+cp LICENSE.txt $DES/
 
 echo "*** uBlock_xpi: Generating meta..."
 python tools/make-firefox-meta.py $DES/
diff --git a/tools/make-opera.sh b/tools/make-opera.sh
index d10dcfc63..005cc13d3 100755
--- a/tools/make-opera.sh
+++ b/tools/make-opera.sh
@@ -19,9 +19,11 @@ cp -R src/_locales $DES/
 cp src/*.html $DES/
 cp platform/chromium/*.js $DES/js/
 cp platform/chromium/manifest.json $DES/
+cp LICENSE.txt $DES/
 
 rm -r $DES/_locales/el
 rm -r $DES/_locales/hi
 rm -r $DES/_locales/mr
 rm -r $DES/_locales/vi
+
 echo "*** uBlock.opera: Package done."
diff --git a/tools/make-safari.sh b/tools/make-safari.sh
index db719bc00..6fdc566fa 100755
--- a/tools/make-safari.sh
+++ b/tools/make-safari.sh
@@ -3,9 +3,11 @@
 # This script assumes a linux environment
 
 echo "*** uBlock.safariextension: Copying files"
+
 DES=dist/build/uBlock.safariextension
 rm -r $DES
 mkdir -p $DES
+
 cp -R assets $DES/
 rm $DES/assets/*.sh
 cp -R src/css $DES/
@@ -14,10 +16,11 @@ cp -R src/js $DES/
 cp -R src/lib $DES/
 cp -R src/_locales $DES/
 cp src/*.html $DES/
-cp src/img/icon_128.png $DES/Icon.png
+mv $DES/img/icon_128.png $DES/Icon.png
 cp platform/safari/*.js $DES/js/
 cp platform/safari/Info.plist $DES/
 cp platform/safari/Settings.plist $DES/
+cp LICENSE.txt $DES/
 
 echo "*** uBlock_xpi: Generating meta..."
 python tools/make-safari-meta.py $DES/