aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtools/killev46
2 files changed, 32 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 55d1ba731d..eeb91e9311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-01 Jason Leach <jasonleach@usa.net>
+
+ * tools/killev: Fix this script to make it work with Solaris.
+ Patch from Louise Miller.
+
2001-01-29 Eskil Heyn Olsen <eskil@eazel.com>
reviewed by: JP Rosevear <jpr@ximian.com>
diff --git a/tools/killev b/tools/killev
index 04b2c1532c..cc24e81664 100755
--- a/tools/killev
+++ b/tools/killev
@@ -1,19 +1,27 @@
-killall -9 wombat 2>/dev/null
-killall -9 lt-wombat 2>/dev/null
-killall -9 tlacuache 2>/dev/null
-killall -9 evolution-addressbook 2>/dev/null
-killall -9 evolution-addres 2>/dev/null
-killall -9 lt-evolution-addressbook 2>/dev/null
-killall -9 lt-evolution-add 2>/dev/null
-killall -9 evolution-calendar 2>/dev/null
-killall -9 evolution-calend 2>/dev/null
-killall -9 lt-evolution-calendar 2>/dev/null
-killall -9 lt-evolution-cal 2>/dev/null
-killall -9 lt-gnomecal 2>/dev/null
-killall -9 evolution-mail 2>/dev/null
-killall -9 lt-evolution-mail 2>/dev/null
-killall -9 lt-evolution-mai 2>/dev/null
-killall -9 evolution-executive-summary 2>/dev/null
-killall -9 lt-evolution-executive-summary 2>/dev/null
-killall -9 lt-evolution-executive-summar 2>/dev/null
-killall -9 evolution 2>/dev/null
+sysname=`uname -s`
+
+if [ "$sysname" = "SunOS" ]; then
+ killcmd="pkill"
+else
+ killcmd="killall"
+fi
+
+$killcmd -9 wombat 2>/dev/null
+$killcmd -9 lt-wombat 2>/dev/null
+$killcmd -9 tlacuache 2>/dev/null
+$killcmd -9 evolution-addressbook 2>/dev/null
+$killcmd -9 evolution-addres 2>/dev/null
+$killcmd -9 lt-evolution-addressbook 2>/dev/null
+$killcmd -9 lt-evolution-add 2>/dev/null
+$killcmd -9 evolution-calendar 2>/dev/null
+$killcmd -9 evolution-calend 2>/dev/null
+$killcmd -9 lt-evolution-calendar 2>/dev/null
+$killcmd -9 lt-evolution-cal 2>/dev/null
+$killcmd -9 lt-gnomecal 2>/dev/null
+$killcmd -9 evolution-mail 2>/dev/null
+$killcmd -9 lt-evolution-mail 2>/dev/null
+$killcmd -9 lt-evolution-mai 2>/dev/null
+$killcmd -9 evolution-executive-summary 2>/dev/null
+$killcmd -9 lt-evolution-executive-summary 2>/dev/null
+$killcmd -9 lt-evolution-executive-summar 2>/dev/null
+$killcmd -9 evolution 2>/dev/null