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

diff --git a/chromium-browser.sh b/chromium-browser.sh
index a6b5d5d..8aa1e38 100755
--- a/chromium-browser.sh
+++ b/chromium-browser.sh
@@ -1,18 +1,39 @@
 #!/bin/sh
+APPNAME=chromium-browser
+LIBDIR=@libdir@
+GDB=/usr/bin/gdb
 
 # 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/chromium-browser/default ] ; then
-	. /etc/chromium-browser/default
+if [ -f /etc/$APPNAME/default ]; then
+	. /etc/$APPNAME/default
 fi
 
-# Always use our ffmpeg libs.
-CHROMIUM_DIR=@libdir@
-export LD_LIBRARY_PATH=$CHROMIUM_DIR${LD_LIBRARY_PATH:+:"$LD_LIBRARY_PATH"}
+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:
+
+@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)
@@ -26,8 +47,16 @@ 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")"
@@ -50,10 +79,65 @@ CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
 export LC_NUMERIC=C
 
 # load PepperFlash if present
-PEPFLASH=$(readlink -f $CHROMIUM_DIR/../browser-plugins/PepperFlash)
+PEPFLASH=$(readlink -f $LIBDIR/../browser-plugins/PepperFlash)
 if [ -f $PEPFLASH/manifest.ver ]; then
 	. $PEPFLASH/manifest.ver
-	PEPPERFLASH_ARGS="--ppapi-flash-path=$PEPFLASH/libpepflashplayer.so --ppapi-flash-version=$version"
+	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
 
-exec $CHROMIUM_DIR/chromium-browser $PEPPERFLASH_ARGS $CHROMIUM_FLAGS "$@"
+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