# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1418668859 -3600
# Node ID 48c2dcc7f7a0a19b31ed28b615ec39937dfe2429
# Parent  8732363b138a51029a30fe75e456e06a05a1dc21# Parent  419e9501872579c96e5c299c47c7197f9df34fee
merge from firefox34

diff -r 8732363b138a -r 48c2dcc7f7a0 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Dec 15 19:39:22 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Dec 15 19:40:59 2014 +0100
@@ -14,6 +14,11 @@
   crashes (bnc#908892)
 
 -------------------------------------------------------------------
+Sat Dec 13 22:13:00 UTC 2014 - Led <ledest@gmail.com>
+
+- fix bashism in mozilla.sh script
+
+-------------------------------------------------------------------
 Sat Nov 29 21:23:03 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 34.0.5 (bnc#908009)
diff -r 8732363b138a -r 48c2dcc7f7a0 MozillaFirefox/mozilla.sh.in
--- a/MozillaFirefox/mozilla.sh.in	Mon Dec 15 19:39:22 2014 +0100
+++ b/MozillaFirefox/mozilla.sh.in	Mon Dec 15 19:40:59 2014 +0100
@@ -131,7 +131,8 @@
 if [ $moz_debug -eq 1 ]; then
   tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
   trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
-  echo -e "set args ${1+"$@"}\nrun" > $tmpfile
+  echo "set args ${1+"$@"}" > $tmpfile
+  echo "run" >> $tmpfile
   echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile"
   exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile
 else