Rewrite csh scripts in sh, use sh instead of csh in scripts

diff --git a/cde/admin/IntegTools/post_install/dec/configMin.src b/cde/admin/IntegTools/post_install/dec/configMin.src
index 0dd018c3c4aaa395bc7b4a4e7da110b6b407fa09..05e52baff2f968ddf759ec2d5daf782095e161f7 100644 (file)
--- a/cde/admin/IntegTools/post_install/dec/configMin.src
+++ b/cde/admin/IntegTools/post_install/dec/configMin.src
@@ -227,7 +227,7 @@ XCOMM ###############################################################
     ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
     if [ -s /tmp/tmppsout ]
     then
-       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
+       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
     else
        /usr/sbin/inetd -s
     fi

diff --git a/cde/admin/IntegTools/post_install/dec/configRun.src b/cde/admin/IntegTools/post_install/dec/configRun.src
index 24ac0a31d191425fa5a64afa4a9b7f5a291c52b3..bfe08b6f23439e02f1b0e20d73e697815c8a7aaa 100644 (file)
--- a/cde/admin/IntegTools/post_install/dec/configRun.src
+++ b/cde/admin/IntegTools/post_install/dec/configRun.src
@@ -429,7 +429,7 @@ DEFAULT_PRINTER="DtPrint"
     ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
     if [ -s /tmp/tmppsout ]
     then
-       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
+       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
     else
        /usr/sbin/inetd -s
     fi

diff --git a/cde/admin/IntegTools/post_install/dec/configTT.src b/cde/admin/IntegTools/post_install/dec/configTT.src
index 34afb6a5ca7fa716119b129ac3bdd15ff85bcd3e..d432e32d000d8a6ca880bff0add3fc4d96b025bd 100644 (file)
--- a/cde/admin/IntegTools/post_install/dec/configTT.src
+++ b/cde/admin/IntegTools/post_install/dec/configTT.src
@@ -228,7 +228,7 @@ XCOMM ######################################################################
     ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
     if [ -s /tmp/tmppsout ]
     then
-       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
+       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
     else
        /usr/sbin/inetd -s
     fi

diff --git a/cde/admin/IntegTools/post_install/sun/configMin.src b/cde/admin/IntegTools/post_install/sun/configMin.src
index 41bb9d0e41674e4874dbef83824e655a1c6b246f..6084980d8e26c651fc994394b1a0f7178d3b4eb1 100755 (executable)
--- a/cde/admin/IntegTools/post_install/sun/configMin.src
+++ b/cde/admin/IntegTools/post_install/sun/configMin.src
@@ -262,7 +262,7 @@ XCOMM ###############################################################
     ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
     if [ -s /tmp/tmppsout ]
     then
-       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
+       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
     else
        /usr/sbin/inetd -s
     fi

diff --git a/cde/admin/IntegTools/post_install/sun/configRun.src b/cde/admin/IntegTools/post_install/sun/configRun.src
index c6b437d458576af1b10964e6653f97a6ea8b0f61..bc691a10b0ea9af7630cdeb7367bff628d3400de 100755 (executable)
--- a/cde/admin/IntegTools/post_install/sun/configRun.src
+++ b/cde/admin/IntegTools/post_install/sun/configRun.src
@@ -313,7 +313,7 @@ DEFAULT_PRINTER="DtPrint"
     ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
     if [ -s /tmp/tmppsout ]
     then
-       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
+       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
     else
        /usr/sbin/inetd -s
     fi

diff --git a/cde/admin/IntegTools/post_install/sun/configTT.src b/cde/admin/IntegTools/post_install/sun/configTT.src
index 6d6f2ca8715a9131f9c2e19943fa60842ae42984..4f6d8341a830256395f270b4fb612ab31a16bea7 100755 (executable)
--- a/cde/admin/IntegTools/post_install/sun/configTT.src
+++ b/cde/admin/IntegTools/post_install/sun/configTT.src
@@ -155,7 +155,7 @@ XCOMM ######################################################################
     ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
     if [ -s /tmp/tmppsout ]
     then
-       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
+       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
     else
        /usr/sbin/inetd -s
     fi

diff --git a/cde/admin/IntegTools/post_install/uxp/configTT.src b/cde/admin/IntegTools/post_install/uxp/configTT.src
index e8f3e987ad3fc0888fa5e851fdd09cb8d7d7b9c6..0b48774c925563179423f67c035dc3b55e367452 100644 (file)
--- a/cde/admin/IntegTools/post_install/uxp/configTT.src
+++ b/cde/admin/IntegTools/post_install/uxp/configTT.src
@@ -155,7 +155,7 @@ XCOMM ######################################################################
     ps -ef | grep inetd | grep -v grep >/tmp/tmppsout
     if [ -s /tmp/tmppsout ]
     then
-       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh
+       awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/sh
     else
        /usr/sbin/inetd -s
     fi

diff --git a/cde/admin/IntegTools/updateTools/kfork b/cde/admin/IntegTools/updateTools/kfork
index 242fd27e9da8375a629bf8e59a0b221d05b4ff3c..d08f3663640c010e3a6f14239f196c8d02f379de 100755 (executable)
--- a/cde/admin/IntegTools/updateTools/kfork
+++ b/cde/admin/IntegTools/updateTools/kfork
@@ -17,17 +17,17 @@ fi
 ps ${PS_ALL_FLAG} | grep $1 > /tmp/tmp.$$
 if  [ -s /tmp/tmp.$$ ]
 then
-       awk '{print "kill", $1}' /tmp/tmp.$$ | /bin/csh
+       awk '{print "kill", $1}' /tmp/tmp.$$ | /bin/sh
        sleep $die_time                  # wait for it to die
        ps ${PS_ALL_FLAG} | grep $1  > /tmp/tmp.$$
        if  [ -s /tmp/tmp.$$ ]
        then
-               awk '{print "kill -3", $1}' /tmp/tmp.$$ | /bin/csh
+               awk '{print "kill -3", $1}' /tmp/tmp.$$ | /bin/sh
                sleep $die_time                 # wait for it to die
                ps ${PS_ALL_FLAG} | grep $1  > /tmp/tmp.$$
                if [ -s /tmp/tmp.$$ ]
                then
-                       awk '{print "kill -9", $1}' /tmp/tmp.$$ | /bin/csh
+                       awk '{print "kill -9", $1}' /tmp/tmp.$$ | /bin/sh
                fi
                rm /tmp/tmp.$$
        fi

diff --git a/cde/programs/dtmail/dtmail/DebugBento b/cde/programs/dtmail/dtmail/DebugBento
index c8102ef9b890678332c32c903ed219833c48f5d0..69933f5c81bf01a17017f565e45abab2f40c47d2 100644 (file)
--- a/cde/programs/dtmail/dtmail/DebugBento
+++ b/cde/programs/dtmail/dtmail/DebugBento
@@ -1,17 +1,19 @@
-#!/bin/csh
+#!/bin/sh
 #
 # A script that aids in debugging and testing dtmail
 #
-if ( `uname -s` != SunOS ) then
+if [ `uname -s` != SunOS ]
+ then
        echo "Only support SunOS"
        exit 1
 endif
-set echo
-setenv DT_MAIL /home/dougr/INBOX
-setenv DEFAULT_BACKEND Bento
-setenv LD_LIBRARY_PATH ../libDtMail:../../../lib/Bento:../../../binstall/lib:$LD_LIBRARY_PATH
+
+export DT_MAIL=$HOME/INBOX
+export DEFAULT_BACKEND=Bento
+export LD_LIBRARY_PATH=../libDtMail:../../../lib/Bento:../../../binstall/lib:$LD_LIBRARY_PATH
 ldd -r dtmail
-if ( -f core ) then
+if [ -f core ]
+ then
        exec debugger dtmail core &
 else
        exec debugger dtmail &

diff --git a/cde/programs/dtmail/dtmail/DebugMime b/cde/programs/dtmail/dtmail/DebugMime
index da738e9900a8bacc7ae00204e08888a516ad411b..7c2507e69b83e092f1a9c91062d3c803a94de67f 100644 (file)
--- a/cde/programs/dtmail/dtmail/DebugMime
+++ b/cde/programs/dtmail/dtmail/DebugMime
@@ -1,18 +1,19 @@
-#!/bin/csh
+#!/bin/sh
 #
 # A script that aids in debugging and testing dtmail
 #
-if ( `uname -s` != SunOS ) then
+if [ `uname -s` != SunOS ]
+ then
         echo "Only support SunOS"
         exit 1
 endif
 
-set echo
-setenv LD_LIBRARY_PATH ../libDtMail:../../../binstall/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=../libDtMail:../../../binstall/lib:$LD_LIBRARY_PATH
 ldd -r dtmail
 
-setenv ARGS    "$*"
-if ( -f core ) then
+export ARGS="$*"
+if [ -f core ]
+ then
        exec debugger dtmail core &
 else
        exec debugger dtmail &

diff --git a/cde/programs/dtmail/dtmail/RunLocalBento b/cde/programs/dtmail/dtmail/RunLocalBento
index ccdc9c8e62ba212f107590ef147d257feec5c9f8..eb6fca7138b3055a1a9cd47dd345c232b984c8f5 100644 (file)
--- a/cde/programs/dtmail/dtmail/RunLocalBento
+++ b/cde/programs/dtmail/dtmail/RunLocalBento
@@ -1,16 +1,16 @@
 #!/bin/csh -f
-set echo
 #
 # A script that aids in debugging and testing dtmail
 #
-if ( `uname -s` != SunOS ) then
+if [ `uname -s` != SunOS ]
+ then
         echo "Only support SunOS"
         exit 1
 endif
 
 
-setenv DT_MAIL /home/dougr/INBOX
-setenv DEFAULT_BACKEND Bento
-setenv LD_LIBRARY_PATH ../libDtMail:../../../lib/Bento:../../../binstall/lib:$LD_LIBRARY_PATH
+export DT_MAIL=$HOME/INBOX
+export DEFAULT_BACKEND=Bento
+export LD_LIBRARY_PATH=../libDtMail:../../../lib/Bento:../../../binstall/lib:$LD_LIBRARY_PATH
 ldd -r ./dtmail
 exec dtmail &

diff --git a/cde/programs/dtmail/dtmail/RunLocalMime b/cde/programs/dtmail/dtmail/RunLocalMime
index 9b4e1d7a467af751c65af0bac13504f3919ff62f..133f7dd05c45e62bb0a22bceed2ca79573ac2a78 100644 (file)
--- a/cde/programs/dtmail/dtmail/RunLocalMime
+++ b/cde/programs/dtmail/dtmail/RunLocalMime
@@ -1,14 +1,14 @@
-#!/bin/csh -f
+#!/bin/sh -f
 #
 # A script that aids in debugging and testing dtmail
 #
-if ( `uname -s` != SunOS ) then
+if [ `uname -s` != SunOS ]
+ then
         echo "Only support SunOS"
         exit 1
 endif
 
-set echo
 #setenv DEFAULT_BACKEND RFC-MIME
-setenv LD_LIBRARY_PATH ../libDtMail:../../../binstall/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=../libDtMail:../../../binstall/lib:$LD_LIBRARY_PATH
 ldd -r ./dtmail
 exec ./dtmail $* &