Fix bug 44140 by fixing relative paths to be absolute. Fix bug 44002 by fixing a typo in this ChangeLog. Fix bug 43195 by changing the awk program that parses the display name

2 files changed, 15 insertions, 5 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 3e94fe8d93b1..28c53c0448e8 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mozilla-firefox
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.16 2004/03/16 06:26:56 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.17 2004/03/19 02:28:36 agriffis Exp $
+
+  18 Mar 2004; Aron Griffis <agriffis@gentoo.org> files/firefox:
+  Fix bug 44140 by fixing relative paths to be absolute. Fix bug 44002 by fixing
+  a typo in this ChangeLog. Fix bug 43195 by changing the awk program that
+  parses the display name
 
   16 Mar 2004; Brad Laue <brad@gentoo.org> mozilla-firefox-0.8-r1.ebuild:
   Properly enable the DOM inspector.
@@ -27,7 +32,7 @@
   15 Feb 2004; Brad Laue <brad@gentoo.org> files/firefox:
   Switch the default new browser type to window, as this matches better with
   firefox on other platforms. Tab mode is still available if placed in the
-  environment variable documented in /usr/bin/firebird.
+  environment variable documented in /usr/bin/firefox
 
   14 Feb 2004; Aron Griffis <agriffis@gentoo.org> files/firefox:
   Roll fix over from MozillaFirebird script for bug 41074
diff --git a/net-www/mozilla-firefox/files/firefox b/net-www/mozilla-firefox/files/firefox
index 8df5c22e76a4..b917bd39ff26 100644
--- a/net-www/mozilla-firefox/files/firefox
+++ b/net-www/mozilla-firefox/files/firefox
@@ -2,7 +2,7 @@
 #
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/files/firefox,v 1.7 2004/03/06 04:03:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/files/firefox,v 1.8 2004/03/19 02:28:36 agriffis Exp $
 
 # Set MOZILLA_NEWTYPE to "window" in your environment if you prefer
 # new Firefox windows instead of new tabs
@@ -45,7 +45,12 @@ while [[ $# -ne 0 ]] ; do
         shift 1 ;;
     esac
   else
-    urls=("${urls[@]}" $1)
+    # check for relative path to a file, transform to absolute path
+    if [[ $1 != *://* && $1 != /* && -e $1 ]]; then
+      urls=("${urls[@]}" "file://$PWD/$1")
+    else
+      urls=("${urls[@]}" $1)
+    fi
     shift
   fi
 done
@@ -54,7 +59,7 @@ done
 declare -a screens=(
   $(xdpyinfo | awk '
     /^name of display:/ { 
-      disp = substr($NF, 0, index($NF, ".")-1) 
+      disp = substr($NF, 0, match($NF, /\.[^.]*$/)-1)
     }
     /^number of screens:/ {
       for (i = 0; i < $NF; i++) printf("%s.%d\n", disp, i)