patch: {bonobo,oaf}-slay

[Laszlo PETER <Laszlo Peter ireland sun com>]

Hi,

bonobo-slay and oaf-slay fail and the style of the ps command is
incorrectly detected if the USER env. variable is not set.

Laca


diff -u -r1.94 configure.in
--- configure.in	5 Dec 2001 22:10:48 -0000	1.94
+++ configure.in	7 Dec 2001 16:03:32 -0000
@@ -158,6 +158,7 @@
 	BONOBO_SLAY=bonobo-slay
 	AC_PATH_PROG(PS_PATH, ps)
 	AC_CACHE_CHECK([for POSIX ps], ac_cv_prog_ps_posix, [
+		USER=${USER:-${LOGNAME:-`logname`}}
 		if $PS_PATH -U $USER -opid,args >/dev/null 2>&1; then
 			ac_cv_prog_ps_posix=yes
 		else

diff -u -r1.3 bonobo-slay.in
--- utils/bonobo-slay.in	14 Aug 2001 18:01:41 -0000	1.3
+++ utils/bonobo-slay.in	7 Dec 2001 16:03:32 -0000
@@ -43,7 +43,13 @@
 
 # Build ps command.
 #
-$username = $ENV{'USER'};
+if ($ENV{'USER'}) {
+	$username=$ENV{'USER'};
+} elsif ($ENV{'LOGNAME'}) {
+	$username=$ENV{'LOGNAME'};
+} else {
+	$username=`logname`;
+}
 chomp($username);
 
 @IF_POSIX_PS@ $ps_cmd = "@PS_PATH@ -U $username -opid,args";