From 6ef30fbab26a15256330d781b9bd53b64e97ec88 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 23 Aug 2018 14:54:43 -0400
Subject: libre/iceweasel: Tidy formatting a touch

---
 libre/iceweasel/PKGBUILD | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'libre/iceweasel/PKGBUILD')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 64b7e7914..6c411c721 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -109,29 +109,27 @@ END
 	END
   fi # end [[ $CARCH = arm* ]]
 
-  # perform rebranding
+  ## Rebranding
   local brandingdir="$srcdir/$pkgname-$_brandingver"
+  # file dump
   rm -rf -- browser/branding/$pkgname
   cp -aT -- $brandingdir/branding browser/branding/$pkgname
-
+  # patching
   rm -rf .pc
   export QUILT_PATCHES=$brandingdir/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
   quilt push -av
-
   # Put "Start Page" branding images in the source code
   install -m644 -t browser/base/content/abouthome -- \
     "$brandingdir/branding"/{drm-free,gnu_headshadow,parabola-banner}.png
   install -m644 -t browser/extensions/onboarding/content/img -- \
      "$brandingdir/branding/watermark.svg"
-
   # produce icons
   for i in 128; do
     rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \
       -o "browser/branding/iceweasel/default$i.png"
   done
-
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
   sed -i 's/Adobe Flash/SWF Player/g' -- \
@@ -142,15 +140,12 @@ END
       -e '/"displayName": "QuickTime"/ s/QuickTime/MOV Player/' \
       -e '/installLinux/ s/true/false/' \
       -i -- browser/base/content/browser-plugins.js
-
   # re-use 'abouthome' page for 'newtab' page
   install -d browser/base/content/newtab
   cat browser/base/content/abouthome/aboutHome.xhtml > browser/base/content/newtab/newTab.xhtml
-
   # Load our searchplugins
   rm -rf -- browser/locales/searchplugins
   cp -aT -- /usr/lib/mozilla/searchplugins browser/locales/searchplugins
-
   # Disable various components at the source level
   sed -i 's/;1/;0/' toolkit/components/telemetry/TelemetryStartup.manifest
   #sed -i 's/;1/;0/' browser/experiments/Experiments.manifest
@@ -172,7 +167,7 @@ package() {
   DESTDIR="$pkgdir" ./mach install
   find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
 
-  local _shortver=$(echo $pkgver | cut -d'.' -f1,2)
+  local _shortver=$(cut -d. -f1,2 <<<"$pkver")
   _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
   install -Dm644 /dev/stdin "$_vendorjs" <<END
 // Use LANG environment variable to choose locale
-- 
cgit v1.2.3