[arch-commits] Commit in chromium/trunk (PKGBUILD chromium.sh)

[Evangelos Foutras]

    Date: Saturday, February 14, 2015 @ 23:03:49
  Author: foutrelis
Revision: 231398

Source additional configuration files (FS#43804)

Modified:
  chromium/trunk/PKGBUILD
  chromium/trunk/chromium.sh

-------------+
 PKGBUILD    |    2 +-
 chromium.sh |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-14 21:13:17 UTC (rev 231397)
+++ PKGBUILD	2015-02-14 22:03:49 UTC (rev 231398)
@@ -17,7 +17,7 @@
          'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
              'elfutils' 'subversion' 'ninja' 'clang')
-[[ $CARCH = x86_64 ]] && makedepends+=('lib32-gcc-libs' 'lib32-zlib')
+makedepends_x86_64=('lib32-gcc-libs' 'lib32-zlib')
 optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
             'gnome-keyring: for storing passwords in GNOME keyring'
             'libgnome-keyring: for storing passwords in GNOME keyring'

Modified: chromium.sh
===================================================================
--- chromium.sh	2015-02-14 21:13:17 UTC (rev 231397)
+++ chromium.sh	2015-02-14 22:03:49 UTC (rev 231398)
@@ -1,11 +1,20 @@
 #!/bin/bash
 
 # Allow users to override command-line options
-# Based on Gentoo's chromium package (and by extension, Debian's)
+# Based on Gentoo's chromium package
 if [[ -f /etc/chromium/default ]]; then
 	. /etc/chromium/default
 fi
+# Source additional configuration files
+for file in /etc/chromium/*; do
+	# Don't source /etc/chromium/default again
+	[[ $file == /etc/chromium/default ]] && continue
 
+	if [[ -f $file ]]; then
+		. $file
+	fi
+done
+
 # Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
 # default CHROMIUM_FLAGS (from /etc/chromium/default)
 CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}