[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium.default chromium-launcher-r3.sh

[Mike Gilbert (floppym)]

floppym     13/03/01 02:15:32

  Modified:             chromium.default
  Added:                chromium-launcher-r3.sh
  Log:
  Beta channel bump. Modify chromium-launcher to source all files in /etc/chromium, bug 459734.
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

Revision  Changes    Path
1.2                  www-client/chromium/files/chromium.default

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium.default?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium.default?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium.default?r1=1.1&r2=1.2

Index: chromium.default
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/files/chromium.default,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium.default	26 May 2011 11:09:13 -0000	1.1
+++ chromium.default	1 Mar 2013 02:15:32 -0000	1.2
@@ -2,4 +2,4 @@
 # the chromium launcher.
 
 # Options to pass to chromium.
-CHROMIUM_FLAGS=""
+#CHROMIUM_FLAGS=""



1.1                  www-client/chromium/files/chromium-launcher-r3.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-launcher-r3.sh?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-launcher-r3.sh?rev=1.1&content-type=text/plain

Index: chromium-launcher-r3.sh
===================================================================
#!/bin/bash

# Allow the user to override command-line flags, bug #357629.
# This is based on Debian's chromium-browser package, and is intended
# to be consistent with Debian.
shopt -s nullglob
for f in /etc/chromium/*; do
    [[ -f ${f} ]] && source "${f}"
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"}

# Let the wrapped binary know that it has been run through the wrapper
export CHROME_WRAPPER=$(readlink -f "$0")

PROGDIR=${CHROME_WRAPPER%/*}

case ":$PATH:" in
  *:$PROGDIR:*)
    # $PATH already contains $PROGDIR
    ;;
  *)
    # Append $PROGDIR to $PATH
    export PATH="$PATH:$PROGDIR"
    ;;
esac

# Set the .desktop file name
export CHROME_DESKTOP="chromium-browser-chromium.desktop"

exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"