summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.sh.in36
-rw-r--r--firefox.spec1
2 files changed, 35 insertions, 2 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index d0067a6..71473f6 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -61,7 +61,8 @@ fi
MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
MOZ_PROGRAM="$MOZ_DIST_BIN/firefox"
-
+MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh"
+
##
## Set MOZ_GRE_CONF
##
@@ -139,5 +140,36 @@ SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
[ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
+# Prepare command line arguments
+script_args=""
+pass_arg_count=0
+while [ $# -gt $pass_arg_count ]
+do
+ case "$1" in
+ -g | --debug)
+ script_args="$script_args -g"
+ debugging=1
+ shift
+ ;;
+ -d | --debugger)
+ script_args="$script_args -d $2"
+ shift 2
+ ;;
+ *)
+ # Move the unrecognized argument to the end of the list.
+ arg="$1"
+ shift
+ set -- "$@" "$arg"
+ pass_arg_count=`expr $pass_arg_count + 1`
+ ;;
+ esac
+done
+
# Run the browser
-exec $MOZ_PROGRAM $MOZARGS ${1+"$@"}
+debugging=0
+if [ $debugging = 1 ]
+then
+ echo $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@"
+fi
+
+exec $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@"
diff --git a/firefox.spec b/firefox.spec
index 43b3c3d..6ca3c55 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -308,6 +308,7 @@ fi
%changelog
* Wed Jan 30 2008 Martin Stransky <stransky@redhat.com> 3.0-0.beta2.14
- Update to latest trunk (2008-01-30)
+- Backported an old laucher
* Mon Jan 28 2008 Martin Stransky <stransky@redhat.com> 3.0-0.beta2.13
- cleared starting scripts, removed useless parts
bgstack15