This patch should work and not throw any segfaults like the last attempt,
compiled and ran the script myself to make sure.
Thank you for your time,
-Chase
From cbe0ef0cff77f34c9054f14b7d889c8adebc87bf Mon Sep 17 00:00:00 2001
From: chase <ch...@localhost.com>
Date: Sun, 10 Jun 2018 11:02:07 -0500
Subject: [PATCH] installCDE.src: remove duplicate code
---
cde/admin/IntegTools/dbTools/installCDE.src | 36 ++-------------------
1 file changed, 3 insertions(+), 33 deletions(-)
diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index e26be3be..0b0c84b3 100755
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -205,31 +205,7 @@ CleanDaemons()
then
stopsrc -s inetd >>$LOGFILE 2>&1
fi
- elif [ "$PLATFORM" = "openbsd" ]
- then
- ps axo pid,comm | grep $i > /tmp/tmppsout
- if [ -s /tmp/tmppsout ]
- then
- awk '{print "kill " $1}' /tmp/tmppsout | /bin/csh -f
- sleep 2
- fi
- elif [ "$PLATFORM" = "freebsd" ]
- then
- ps axo pid,comm | grep $i > /tmp/tmppsout
- if [ -s /tmp/tmppsout ]
- then
- awk '{print "kill " $1}' /tmp/tmppsout | /bin/csh -f
- sleep 2
- fi
- elif [ "$PLATFORM" = "netbsd" ]
- then
- ps axo pid,comm | grep $i > /tmp/tmppsout
- if [ -s /tmp/tmppsout ]
- then
- awk '{print "kill " $1}' /tmp/tmppsout | /bin/csh -f
- sleep 2
- fi
- elif [ "$PLATFORM" = "linux" ]
+ elif [ "$PLATFORM" = "openbsd" -o "$PLATFORM" = "freebsd" -o "$PLATFORM" = "netbsd" -o "$PLATFORM" = "linux" ]
then
ps axo pid,comm | grep $i > /tmp/tmppsout
if [ -s /tmp/tmppsout ]
@@ -241,7 +217,7 @@ CleanDaemons()
ps -ef | grep $i | grep -v grep >/tmp/tmppsout
if [ -s /tmp/tmppsout ]
then
- awk '{print "kill " $2}' /tmp/tmppsout | /bin/csh -f
+ awk '{print "kill " $2}' /tmp/tmppsout | /bin/sh -f
sleep 2
fi
fi
@@ -262,18 +238,12 @@ RestartInetd()
elif [ "$PLATFORM" = "aix" ]
then
startsrc -s inetd >>$LOGFILE 2>&1
- elif [ "$PLATFORM" = "dec" ]
- then
- /usr/sbin/inetd
- elif [ "$PLATFORM" = "openbsd" ]
+ elif [ "$PLATFORM" = "openbsd" -o "$PLATFORM" = "netbsd" ]
then
/etc/rc.d/inetd start >/dev/null
elif [ "$PLATFORM" = "freebsd" ]
then
/etc/rc.d/inetd onestart
- elif [ "$PLATFORM" = "netbsd" ]
- then
- /etc/rc.d/inetd start >/dev/null
elif [ "$PLATFORM" = "linux" ]
then
/etc/init.d/openbsd-inetd start >/dev/null 2>&1
--
2.17.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
