rpms/firefox/devel firefox.sh.in, 1.29, 1.30 firefox.spec, 1.243, 1.244

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19412

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
Backported old laucher


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- firefox.sh.in	28 Jan 2008 14:10:56 -0000	1.29
+++ firefox.sh.in	30 Jan 2008 14:16:28 -0000	1.30
@@ -61,7 +61,8 @@
 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 @@
 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 "$@"


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- firefox.spec	30 Jan 2008 12:40:35 -0000	1.243
+++ firefox.spec	30 Jan 2008 14:16:28 -0000	1.244
@@ -308,6 +308,7 @@
 %changelog
 * Wed Jan 30 2008 Martin Stransky <stransky at 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 at redhat.com> 3.0-0.beta2.13
 - cleared starting scripts, removed useless parts