From 4f8b4064596d2daa5e466f9f72b4a4ac01fcd72d Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 14 May 2015 22:14:51 +0000 Subject: chromium-dev: parametrize the startup wrapper (stable/dev) --- chromium-dev/build/chromium-dev.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'chromium-dev') diff --git a/chromium-dev/build/chromium-dev.sh b/chromium-dev/build/chromium-dev.sh index 026babbc..ef158740 100644 --- a/chromium-dev/build/chromium-dev.sh +++ b/chromium-dev/build/chromium-dev.sh @@ -2,16 +2,16 @@ # Allow users to override command-line options # Based on Gentoo's chromium package (and by extension, Debian's) -if [[ -f /etc/default/chromium-dev ]]; then - . /etc/default/chromium-dev -fi +for FILE in /etc/chromium@SRCEXT@/*.conf ; do + [[ -f ${FILE} ]] && source "${FILE}" +done -# Prefer user defined CHROMIUM_DEV_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/default/chromium-dev) -CHROMIUM_DEV_FLAGS=${CHROMIUM_DEV_USER_FLAGS:-$CHROMIUM_DEV_FLAGS} +# Prefer user defined @CRUSERFLAGS@ flags (from environment) over +# system default @CRFLAGS@ (from /etc/chromium@SRCEXT@)/) +@CRFLAGS@=${@CRUSERFLAGS@:-$@CRFLAGS@} export CHROME_WRAPPER=$(readlink -f "$0") -export CHROME_DESKTOP=chromium-dev.desktop +export CHROME_DESKTOP=chromium@SRCEXT@.desktop -exec /usr/lib@LIBDIRSUFFIX@/chromium-dev/chromium-dev $CHROMIUM_DEV_FLAGS "$@" +exec /usr/lib@LIBDIRSUFFIX@/chromium@SRCEXT@/chromium@SRCEXT@ $@CRFLAGS@ "$@" -- cgit v1.2.3