Modified the phoenix startup script (see bug #15202 for additional info).

2 files changed, 35 insertions, 12 deletions

diff --git a/net-www/phoenix-bin/ChangeLog b/net-www/phoenix-bin/ChangeLog
index c5cb9ca3fa3b..e09597940b2b 100644
--- a/net-www/phoenix-bin/ChangeLog
+++ b/net-www/phoenix-bin/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for net-www/phoenix-bin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/ChangeLog,v 1.18 2003/03/05 13:03:49 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/ChangeLog,v 1.19 2003/03/05 13:12:05 phoenix Exp $
 
 *phoenix-bin-0.5 (30 Dec 2002)
 
-  05 Mar 2003; phoen][x <phoenix@gentoo.org> phoenix-bin-0.5.ebuild
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> files/phoenix :
+  Modified the phoenix startup script (see bug #15202 for additional info).
+
   Updated the gtk dependencies. See bug #13112 for further details.
   Thanks to Max Kalika <alkern23@yahoo.com> for the contribution.
 
@@ -13,6 +15,9 @@
 	
 *phoenix-bin-0.4-r2 (10 Dec 2002)
 
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> files/phoenix :
+  Modified the phoenix startup script (see bug #15202 for additional info).
+
   10 Dec 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.5.ebuild 
   files/digest-phoenix-bin-0.5 :
   Version bump. Tagging that unstable.
@@ -22,6 +27,9 @@
  
 *phoenix-bin-20021121 (21 Nov 2002)
 
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> files/phoenix :
+  Modified the phoenix startup script (see bug #15202 for additional info).
+
   21 Nov 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.5.ebuild,
   files/digest-phoenix-bin-0.5.ebuild :
   Removing this from the tree because 20021121 > 0.5 from portage's view.
@@ -37,6 +45,9 @@
 
 *phoenix-bin-0.4-r2 (19 Nov 2002)
 
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> files/phoenix :
+  Modified the phoenix startup script (see bug #15202 for additional info).
+
   19 Nov 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.4-r2.ebuild 
   files/digest-phoenix-bin-0.4-r2 :
   Made phoenix mozilla plugin compliant. The new plugin layout for 
@@ -46,6 +57,9 @@
 
 *phoenix-bin-0.4-r1 (17 Nov 2002)
 
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> files/phoenix :
+  Modified the phoenix startup script (see bug #15202 for additional info).
+
   17 Nov 2002; phoen][x <phoenix@gentoo.org> files/phoenix :
   Updated the wrapper - phoenix and mozilla should play nice now.
 
@@ -57,6 +71,9 @@
 
 *phoenix-bin-0.4 (31 Oct 2002)
 
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> files/phoenix :
+  Modified the phoenix startup script (see bug #15202 for additional info).
+
   17 Nov 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.4.ebuild :
   Put the ebuild into the stable profile.
 
@@ -73,6 +90,9 @@
 
 *phoenix-bin-0.3 (27 Oct 2002)
 
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> files/phoenix :
+  Modified the phoenix startup script (see bug #15202 for additional info).
+
   17 Nov 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.3.ebuild :
   Put the ebuild into the stable profile.
 
diff --git a/net-www/phoenix-bin/files/phoenix b/net-www/phoenix-bin/files/phoenix
index b381033ecc68..98fb9d373db1 100644
--- a/net-www/phoenix-bin/files/phoenix
+++ b/net-www/phoenix-bin/files/phoenix
@@ -1,17 +1,20 @@
 #!/bin/sh
 
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/files/phoenix,v 1.5 2003/03/05 13:12:05 phoenix Exp $
+
+# This is the Gentoo Phoenix startup script
+# Additions, suggestions?
+# contact phoen][x <phoenix@gentoo.org>
+
 export MOZILLA_FIVE_HOME="/usr/lib/phoenix"
 PHOENIX_PATH="/usr/lib/phoenix"
 
-# Seems like pidof resides in /sbin on some boxes
-# Modifying the PATH to reflect that
-PATH="/sbin:${PATH}"
-
-if [ -z "`pidof phoenix-bin`" ]; then
-	# No phoenix running
-	${PHOENIX_PATH}/phoenix $@
+if [ -z "`/bin/ps x | /bin/grep \"[0-9] ${PHOENIX_PATH}/phoenix-bin\"`" ]; then
+    # No phoenix running
+    ${PHOENIX_PATH}/phoenix $@
 else
-	# phoenix running - open a new window
-	${PHOENIX_PATH}/phoenix -remote "openURL($@ ,new-window)"
+    # phoenix running - open a new window
+    ${PHOENIX_PATH}/phoenix -remote "openURL($@ ,new-window)"
 fi
-