From cfef3aeb2b28d8b86e88fea50ced2f7453809f65 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Fri, 10 Nov 2017 11:36:55 -0500
Subject: [PATCH] minor review of shell scripts

---
 tools/make-chromium.sh |  4 +++-
 tools/make-opera.sh    | 29 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
index b6d9d2aab..af36c29d1 100755
--- a/tools/make-chromium.sh
+++ b/tools/make-chromium.sh
@@ -16,7 +16,6 @@ cp -R src/img               $DES/
 cp -R src/js                $DES/
 cp -R src/lib               $DES/
 cp -R src/_locales          $DES/
-cp -R $DES/_locales/nb      $DES/_locales/no
 cp src/*.html               $DES/
 cp platform/chromium/*.js   $DES/js/
 cp -R platform/chromium/img $DES/
@@ -31,6 +30,9 @@ grep -v "^'use strict';$" $DES/js/contentscript.js >> /tmp/contentscript.js
 mv /tmp/contentscript.js $DES/js/contentscript.js
 rm $DES/js/vapi-usercss.js
 
+# Chrome store-specific
+cp -R $DES/_locales/nb      $DES/_locales/no
+
 echo "*** uBlock0.chromium: Generating meta..."
 python tools/make-chromium-meta.py $DES/
 
diff --git a/tools/make-opera.sh b/tools/make-opera.sh
index e81a5044c..596b7ce82 100755
--- a/tools/make-opera.sh
+++ b/tools/make-opera.sh
@@ -6,33 +6,32 @@ echo "*** uBlock0.opera: Creating web store package"
 echo "*** uBlock0.opera: Copying files"
 
 DES=dist/build/uBlock0.opera
-rm -r $DES
+rm -rf $DES
 mkdir -p $DES
 
 bash ./tools/make-assets.sh $DES
 
-cp -R src/css $DES/
-cp -R src/img $DES/
-cp -R src/js $DES/
-cp -R src/lib $DES/
-cp -R src/_locales $DES/
-
-cp src/*.html $DES/
-cp platform/chromium/*.html $DES/
+cp -R src/css               $DES/
+cp -R src/img               $DES/
+cp -R src/js                $DES/
+cp -R src/lib               $DES/
+cp -R src/_locales          $DES/
+cp src/*.html               $DES/
 cp platform/chromium/*.js   $DES/js/
-cp platform/chromium/*.json $DES/
 cp -R platform/chromium/img $DES/
+cp platform/chromium/*.html $DES/
+cp platform/chromium/*.json $DES/
+cp LICENSE.txt              $DES/
 
+# Opera-specific
 cp platform/opera/manifest.json $DES/
-cp LICENSE.txt $DES/
-
-echo "*** uBlock0.opera: Generating meta..."
-python tools/make-opera-meta.py $DES/
-
 rm -r $DES/_locales/cv
 rm -r $DES/_locales/hi
 rm -r $DES/_locales/ka
 rm -r $DES/_locales/mr
 rm -r $DES/_locales/ta
 
+echo "*** uBlock0.opera: Generating meta..."
+python tools/make-opera-meta.py $DES/
+
 echo "*** uBlock0.opera: Package done."