From 0ffb04938c08876470b5db452fb0d5474fc1828b Mon Sep 17 00:00:00 2001
From: "Matthew R. Trower" <dev@blackshard.net>
Date: Tue, 30 Oct 2018 08:56:44 -0500
Subject: [PATCH] Repair and simplify installCDE.src:CleanDaemons()

---
 cde/admin/IntegTools/dbTools/installCDE.src | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index f9665f91..a00fefd1 100755
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -201,25 +201,10 @@ CleanDaemons()
       then
         stopsrc -s inetd >>$LOGFILE 2>&1
       fi
-    elif [ "$PLATFORM" = "openbsd" ] || [ "$PLATFORM" = "freebsd" ] || \
-	 [ "$PLATFORM" = "netbsd" ] || [ "$PLATFORM" = "linux" ]
-    then
-      pgrep pid,comm > /tmp/tmppsout
-      if [ -s /tmp/tmppsout ]
-      then
-        awk '{print "kill " $1}' /tmp/tmppsout | /bin/sh -f
-        sleep 2
-      fi
     else    
-      pgrep -v pgrep >/tmp/tmppsout
-      if [ -s /tmp/tmppsout ]
-      then
-        awk '{print "kill " $2}' /tmp/tmppsout | /bin/sh -f
-        sleep 2
-      fi
+      ps -eo pid,comm | grep $i | awk '{print "kill " $1}' | /bin/sh
     fi
   done
-  rm -f /tmp/tmppsout
 }
 
 RestartInetd()
-- 
2.25.1