X-Git-Url: http://git.pld-linux.org/?p=packages%2Fchromium-browser.git;a=blobdiff_plain;f=chromium-browser.sh;h=8aa1e380ea2393642ee035ffd55a741b5350af0e;hp=00047febf503599f586e02cf31ab0e0473af3605;hb=HEAD;hpb=f0506bfdbda2929142aed3380b07a44ef11c8324

diff --git a/chromium-browser.sh b/chromium-browser.sh
old mode 100644
new mode 100755
index 00047fe..8aa1e38
--- a/chromium-browser.sh
+++ b/chromium-browser.sh
@@ -1,15 +1,39 @@
 #!/bin/sh
+APPNAME=chromium-browser
+LIBDIR=@libdir@
+GDB=/usr/bin/gdb
 
-# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Allow the user to override command-line flags, http://bugs.gentoo.org/357629
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+if [ -f /etc/$APPNAME/default ]; then
+	. /etc/$APPNAME/default
+fi
+
+die() {
+	echo >&2 "$*"
+	exit 1
+}
+
+usage() {
+	cat <<EOF
+$APPNAME [-h|--help] [-g|--debug] [--temp-profile] [options] [URL]
+
+		-g or --debug           Start within $GDB
+		-h or --help            This help screen
+		--temp-profile          Start with a new and temporary profile
+
+Other supported options are:
 
-# Always use our ffmpeg libs.
-# Also symlinks for nss/nspr libs can be found from our dir.
-export LD_LIBRARY_PATH=@libdir@${LD_LIBRARY_PATH:+:"$LD_LIBRARY_PATH"}
+@OPTIONS@
+See 'man $APPNAME' for more details
+EOF
+}
+
+export LD_LIBRARY_PATH=$LIBDIR${LD_LIBRARY_PATH:+:"$LD_LIBRARY_PATH"}
 
 # for to find xdg-settings
-export PATH=@libdir@${PATH:+:"$PATH"}
+export PATH=$LIBDIR${PATH:+:"$PATH"}
 
 # chromium needs /dev/shm being mounted
 m=$(awk '$2 == "/dev/shm" && $3 == "tmpfs" {print}' /proc/mounts)
@@ -23,18 +47,97 @@ if [ -z "$m" ]; then
 	EOF
 fi
 
+# lsb_release is slow so try to source the static file /etc/lsb-release
+# instead, and fallback to lsb_release if we didn't get the information we need
+if [ -e /etc/lsb-release ]; then
+	. /etc/lsb-release
+fi
+DIST=${DISTRIB_ID:-$(lsb_release -si)}
+RELEASE=${DISTRIB_CODENAME:-$(lsb_release -sc)}
+
 # Set CHROME_VERSION_EXTRA visible in the About dialog and in about:version
-export CHROME_VERSION_EXTRA="PLD Linux"
+export CHROME_VERSION_EXTRA="$DIST Linux $RELEASE"
+
+# Let the wrapped binary know that it has been run through the wrapper
+export CHROME_WRAPPER="$(readlink -f "$0")"
 
 # Google Chrome has a number of command line switches which change the behavior of Chrome
 # This param allows you to set extra args for browser startup.
-# See source for possible choices:
-# http://git.chromium.org/gitweb/?p=chromium.git;f=chrome/common/chrome_switches.cc;hb=HEAD
-# Also: http://peter.sh/experiments/chromium-command-line-switches/
+# See: http://peter.sh/experiments/chromium-command-line-switches/
 CHROME_FLAGS_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/chromium/Chrome Flags"
 if [ -f "$CHROME_FLAGS_FILE" ]; then
 	# All lines starting with # are ignored
-	CHROME_FLAGS=$(grep -v '^#' "$CHROME_FLAGS_FILE")
+	CHROMIUM_USER_FLAGS=$(grep -v '^#' "$CHROME_FLAGS_FILE")
 fi
 
-exec @libdir@/chromium-browser --password-store=detect $CHROME_FLAGS "$@"
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium-browser/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
+# Google guys cannot properly handle comma, so download speed/est is shown
+# as not a number (NaN). Workaround that with LC_NUMERIC=C
+export LC_NUMERIC=C
+
+# load PepperFlash if present
+PEPFLASH=$(readlink -f $LIBDIR/../browser-plugins/PepperFlash)
+if [ -f $PEPFLASH/manifest.ver ]; then
+	. $PEPFLASH/manifest.ver
+	CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ppapi-flash-path=$PEPFLASH/libpepflashplayer.so --ppapi-flash-version=$version"
+fi
+
+want_debug=0
+want_temp_profile=0
+while [ $# -gt 0 ]; do
+	case "$1" in
+	-h | --help | -help)
+		usage
+		exit 0 ;;
+	-g | --debug)
+		want_debug=1
+		shift ;;
+	--temp-profile)
+		want_temp_profile=1
+		shift ;;
+	-- ) # Stop option prcessing
+		shift
+		break ;;
+	*)
+		break ;;
+	esac
+done
+
+if [ $want_temp_profile -eq 1 ]; then
+	TEMP_PROFILE=$(mktemp -d) || exit 1
+	CHROMIUM_FLAGS="$CHROMIUM_FLAGS --user-data-dir=$TEMP_PROFILE"
+fi
+
+if [ $want_debug -eq 1 ]; then
+	if [ ! -x $GDB ]; then
+		die "Sorry, can't find usable $GDB. Please install it."
+	fi
+
+	tmpfile=$(mktemp /tmp/chromiumargs.XXXXXX) || die "Cannot create temporary file"
+	trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
+	echo "set args $CHROMIUM_FLAGS ${1+"$@"}" > $tmpfile
+	echo "# Env:"
+	echo "#     LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+	echo "#                PATH=$PATH"
+	echo "#            GTK_PATH=$GTK_PATH"
+	echo "# CHROMIUM_USER_FLAGS=$CHROMIUM_USER_FLAGS"
+	echo "#      CHROMIUM_FLAGS=$CHROMIUM_FLAGS"
+	echo "$GDB $LIBDIR/$APPNAME -x $tmpfile"
+	$GDB "$LIBDIR/$APPNAME" -x $tmpfile
+	rc=$?
+	if [ $want_temp_profile -eq 1 ]; then
+		rm -rf $TEMP_PROFILE
+	fi
+	exit $rc
+else
+	if [ $want_temp_profile -eq 0 ]; then
+		exec $LIBDIR/$APPNAME $CHROMIUM_FLAGS "$@"
+	else
+		# we can't exec here as we need to clean-up the temporary profile
+		$LIBDIR/$APPNAME $CHROMIUM_FLAGS "$@"
+		rm -rf $TEMP_PROFILE
+	fi
+fi