Use KORNSHELL variable instead of /bin/ksh
authorMarcin Cieslak <saper@saper.info>
Thu, 23 Aug 2012 15:49:26 +0000 (17:49 +0200)
committerJon Trulson <jon@radscan.com>
Fri, 24 Aug 2012 02:00:43 +0000 (20:00 -0600)
This patch removes instances of hardcoded
invocation of /bin/ksh and allows to
replace it with, for, example,
/usr/local/bin/ksh93

Also "ksh93" is accepted whenever "ksh" is.

Tested using the following /bin/ksh:

----8<----
WHAT=`ps -o command= -p $PPID`
msg="Something tried to call /bin/ksh: $PPID: $WHAT"
print -u2 "$msg"
logger user.warn "$msg"
exit 99
----8<----
(Warning: first two lines are FreeBSD specific)

Scripts from Makefiles should now be executed either
with

$(KORNSHELL) korn-shell-script

or

$(SHELL) bourne-shell-script

therefore #!/bin/ksh has not been changed everywhere.

/usr/dt/bin/ scripts have been converted (e.g. Xsession)

Whenever possible Imake and CPP facilities have been used.

For C and C++ programs KORNSHELL needs to be defined to
"/path/to/your/ksh" (with quotes) so that it can make
a valid C constant.

Therefore, when adding KORNSHELL to Imakefile for C files,
you have to add

CXXEXTRA_DEFINES = -DKORNSHELL=\"$(KORNSHELL)\"

or similar (for example, see programs/dtprintinfo)

But for simple shell script substitution we usually change

 LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                     -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP)

to:

 LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                     -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
                     -DKORNSHELL=$(KORNSHELL) \
                     -DXPROJECTROOT=X11ProjectRoot

since we don't want quotes for shell scripts.

32 files changed:
cde/admin/IntegTools/dbTools/Imakefile
cde/admin/IntegTools/dbTools/dinstallCDE.src
cde/admin/IntegTools/dbTools/installCDE.src
cde/admin/IntegTools/dbTools/linksLast
cde/admin/IntegTools/dbTools/uncomment
cde/programs/dtappintegrate/Imakefile
cde/programs/dtappintegrate/dtappintegrate.src
cde/programs/dtfile/Find.c
cde/programs/dtfile/Imakefile
cde/programs/dtlogin/config/0015.sun.env.src
cde/programs/dtlogin/config/0050.dtxmodmap.src
cde/programs/dtlogin/config/0060.dtsysenv.src
cde/programs/dtlogin/config/Imakefile
cde/programs/dtlogin/config/Xreset.src
cde/programs/dtlogin/config/Xsession.ow.src
cde/programs/dtlogin/config/Xsession.ow2.src
cde/programs/dtlogin/config/Xsession.src
cde/programs/dtlogin/config/Xsetup.src
cde/programs/dtlogin/config/Xstartup.src
cde/programs/dtlogin/config/dtlslocale.src
cde/programs/dtprintegrate/Imakefile
cde/programs/dtprintegrate/dtprintegrate.src
cde/programs/dtprintinfo/libUI/MotifUI/Imakefile
cde/programs/dtprintinfo/libUI/MotifUI/MotifThread.C
cde/programs/dtprintinfo/util/Imakefile
cde/programs/dtprintinfo/util/Invoke.C
cde/programs/dtsession/Imakefile
cde/programs/dtsession/dtloadresources.src
cde/programs/types/Imakefile
cde/programs/types/unsupported.dt.src
cde/programs/types/uxstd.dt.src
cde/programs/types/xclients.dt.src

index 2a9cb4909ebc0ff9d0868f0c87851db6af0b25cf..3885ac430955e3124c95a27cb99f06491523e142 100644 (file)
@@ -3,6 +3,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/04/23 21:26:14 drk $
 LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                     -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
+                    -DKORNSHELL=$(KORNSHELL) \
                     -Usun -Uusl -Uuxp -Uaix -Udec -UAIX -Uibm -Uhp
 
 AllTarget(installCDE dinstallCDE)
index 78d2e90ffc580c97fde7b0a8bdbc00411858b37f..d0dba08d0fc265f3df58a4f15b2220b0811ec12b 100755 (executable)
@@ -1,4 +1,4 @@
-XCOMM! /bin/ksh
+XCOMM! KORNSHELL
 XCOMM $XConsortium: dinstallCDE.src /main/8 1996/11/25 14:20:36 drk $
 
 XCOMM
@@ -71,12 +71,12 @@ DoLangScript()
   if [ -x $POST_INSTALL_DIR/$PLATFORM_SCRIPT_DIR/$ScriptName ]
   then
     Log "Executing $PLATFORM specific $FilesetName de-customize script"
-    $POST_INSTALL_DIR/$PLATFORM_SCRIPT_DIR/$ScriptName -d $3 2>&1 | \
+    KORNSHELL $POST_INSTALL_DIR/$PLATFORM_SCRIPT_DIR/$ScriptName -d $3 2>&1 | \
                                tee -a /tmp/$ScriptName.dverify
   elif [ -x $POST_INSTALL_DIR/$ScriptName ]
   then
     Log "Executing $FilesetName de-customize script" 
-    $POST_INSTALL_DIR/$ScriptName -d $3 2>&1 | tee -a /tmp/$ScriptName.dverify
+    KORNSHELL $POST_INSTALL_DIR/$ScriptName -d $3 2>&1 | tee -a /tmp/$ScriptName.dverify
   fi
 }
 
index 9c9027879a5622ba570011db20cdaa520548b368..f6b427adc70865def7fc1666620d1b8522be2ceb 100755 (executable)
@@ -1,4 +1,4 @@
-XCOMM! /bin/ksh
+XCOMM! KORNSHELL
 XCOMM $XConsortium: installCDE.src /main/20 1996/11/25 14:21:13 drk $
 
 XCOMM
@@ -154,12 +154,12 @@ DoFilesetScript()
     if [ -x $POST_INSTALL_DIR/$PLATFORM_SCRIPT_DIR/$ScriptName ]
     then
        Log "Executing $PLATFORM specific $FilesetName customize script"
-       $POST_INSTALL_DIR/$PLATFORM_SCRIPT_DIR/$ScriptName -e 2>&1 | \
+       KORNSHELL $POST_INSTALL_DIR/$PLATFORM_SCRIPT_DIR/$ScriptName -e 2>&1 | \
                                tee -a $LOGFILE
     elif [ -x $POST_INSTALL_DIR/$ScriptName ]
     then
        Log "Executing $FilesetName customize script" 
-       $POST_INSTALL_DIR/$ScriptName -e 2>&1 | tee -a $LOGFILE
+       KORNSHELL $POST_INSTALL_DIR/$ScriptName -e 2>&1 | tee -a $LOGFILE
     fi
   fi
 }
@@ -182,7 +182,7 @@ CreatePackingList()
     for i in `echo $DATABASE_FILES`
     do
       Log "  for $i"
-      $TOOL_DIR/udbToAny.ksh -toDB -ReleaseStream $PLATFORM $DATABASE_DIR/${i}.udb > /tmp/${i}.db
+      KORNSHELL $TOOL_DIR/udbToAny.ksh -toDB -ReleaseStream $PLATFORM $DATABASE_DIR/${i}.udb > /tmp/${i}.db
       if [ -r /tmp/${i}.db ]
       then
         for file in `fgrep install_target /tmp/${i}.db | cut -sf 2 -d \: ` 
@@ -490,10 +490,10 @@ XCOMM don't bother if the fileset doesn't exist
 
   Log "  $num installing database $2"
   Log "      - creating ${2}.lst file"
-  $TOOL_DIR/udbToAny.ksh  -toLst -ReleaseStream $PLATFORM \
+  KORNSHELL $TOOL_DIR/udbToAny.ksh  -toLst -ReleaseStream $PLATFORM \
             $DATABASE_DIR/${2}.udb >  /tmp/${2}.lst
   Log "      - installing ... \c"
-  $TOOL_DIR/mkProd -D / -S $BUILD_TREE /tmp/${2}.lst \
+  KORNSHELL $TOOL_DIR/mkProd -D / -S $BUILD_TREE /tmp/${2}.lst \
             2>/tmp/${2}.err 1>/tmp/${2}.good
   Log "done."
 
index 59dba1cf85d1a6b6402a3c7a9e1286dba485060f..d79e6bdd3f5c1b798d3d4f45c6fae560cb106c3b 100755 (executable)
@@ -1,4 +1,4 @@
-#! /bin/ksh
+#! /bin/sh
 
 #
 # Script to move all link refereces in a ".lst" file
index ac368f6b89f62bac8a0202f5e835113c83ff9786..699120c40389c4553458ecad45f1a9e92d2142af 100755 (executable)
@@ -1,4 +1,4 @@
-#! /bin/ksh
+#! /bin/sh
 
 #
 # Script to remove comments and blank lines from ".lst" files
index 3a4760c0dfe5c98c0e11a9f40a1b70dc6b2b7ed0..e91b605ab343c9cb472ea1600bb39be288d87bf3 100644 (file)
@@ -1,7 +1,8 @@
 XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:27:34 drk $
 
 LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-                    -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
+                    -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
+                    -DKORNSHELL=$(KORNSHELL)
 
 CppScriptTarget(dtappintegrate,dtappintegrate.src,$(LOCAL_CPP_DEFINES),)
 
index 93cc256460c996097169e187065a3db60a8d11de..6a4f8ab63f42f32359a0bd05a6576906be534995 100755 (executable)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+XCOMM!KORNSHELL
 XCOMM $XConsortium: dtappintegrate.src /main/4 1996/04/21 19:27:37 drk $
 #define COMMENT_STAR *
 XCOMM ###################################################################
index 094d2854ce1f04a07972a1114402b4f20ca718f0..3398f79549b065d5c28b8eb1f7724b350fb5c35d 100644 (file)
@@ -2887,7 +2887,7 @@ findpopen(cmd,mode,childpid)
          (void) fcntl(childside, F_DUPFD, read_or_write);
          (void) close(childside);        /* Save a file descriptor */
       }
-      (void) execl("/bin/ksh", "ksh", "-c", cmd, (char *)0);
+      (void) execl(KORNSHELL, "ksh", "-c", cmd, (char *)0);
      /* Need to process the error return */
 
       DBGFORK(("%s:  child exiting\n", pname));
index 0d0febc2f2f3b4191a6258a1d139f97d3a2981a7..d8003e719f300cfa489fb0e55aebd2fa5ff4aa26 100644 (file)
@@ -11,7 +11,8 @@ DependSubdirs($(SUBDIRS))
 
 DEFINES = -DMULTIBYTE -DXK_MISCELLANY -DSHAPE -D_ILS_MACROS -DSUN_PERF \
        -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-       -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
+       -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
+       -DKORNSHELL=\"$(KORNSHELL)\"
 
 INCLUDES = -I./dtcopy
 
index c44ad7c1ab7b761eef01dd9478c7b1bdead4fb85..f9af9faeb29fec4d0155a88cdf2b7ff7a6e447b8 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh 
+XCOMM!KORNSHELL
 XCOMM ####################################################################
 XCOMM ##  File:              0015.sun.env.src 
 XCOMM ##
index 9e38b07f65b8d86f08bbdd1df0027f05690f71c9..480f6f8b2b2d624b1c71e838f9021fa18768c3b5 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+XCOMM!KORNSHELL
 XCOMM ####################################################################
 XCOMM ##  File:              0050.dtxmodmap
 XCOMM ##
index 973b56646fa8db44f717024eae676b18193df821..1b9a93b908cc56cff235b69c4bbc835131c3cb17 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM !/usr/bin/ksh
+XCOMM !KORNSHELL
 XCOMM ####################################################################
 XCOMM ##  File:              0060.srcsysenv
 XCOMM ##
index 0a93f7fb99516558a838d3d8d6e54c1cb4f97dc2..0c96dade8bef9a211087eaa7bc42b3e974c4b35e 100644 (file)
@@ -19,6 +19,7 @@ Xservers:
 LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                     -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                     -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
+                    -DKORNSHELL=$(KORNSHELL) \
                     -DXPROJECTROOT=X11ProjectRoot
 
 
index 55a1e0b8963b48c0972eb45cd3d9643d3006b7ba..d2387984e1c52cbfd0c29e31324efa493207f64a 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM! /bin/ksh
+XCOMM! KORNSHELL
 XCOMM ##########################################################################
 XCOMM
 XCOMM   Xreset
index 7688e04bb8f1def3d0aaef3abf3a3c0430a2ec08..9d277c7b6ff2c37cc2e1ac8771cad918d1d442dc 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh 
+XCOMM!KORNSHELL
 XCOMM $XConsortium: Xsession.ow.src /main/3 1996/11/19 11:41:19 drk $
 XCOMM ####################################################################
 XCOMM ##  File:              Xsession.ow
index 631de6024cfac4cea3e05e143360a05d45b6837a..340eee57e83bc4f8bf2862ba992d2641ee15be72 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh 
+XCOMM!KORNSHELL
 XCOMM $XConsortium: Xsession.ow2.src /main/3 1996/11/19 11:41:57 drk $
 XCOMM ####################################################################
 XCOMM ##  File:              Xsession.ow2
index 02f14160d8e01c1b774b72a74d50087e1bf1e923..fc62821fa19c3e51a3e41a2526bf9d23e223de9b 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM! /bin/ksh
+XCOMM! KORNSHELL
 XCOMM ##########################################################################
 XCOMM
 XCOMM   Xsession
@@ -422,7 +422,7 @@ XCOMM ##########################################################################
   HASH source the .dtprofile.
   HASH
   if [ -f $HOME/$DTPROFILE ]; then
-    dtprofile_errors=`/bin/ksh -n $HOME/$DTPROFILE 2>&1`
+    dtprofile_errors=`KORNSHELL -n $HOME/$DTPROFILE 2>&1`
     if [ "0" = "$?" ]; then
       Log "sourcing $HOME/$DTPROFILE..."
       . $HOME/$DTPROFILE
@@ -512,7 +512,7 @@ StartFirst()
   if [ "$DTSOURCEPROFILE" = "true" ]
   then
     case ${SHELL##*/} in
-       sh | ksh | dtksh) shellprofile="$HOME/.profile";;
+       sh | ksh | ksh93 | dtksh) shellprofile="$HOME/.profile";;
        bash) shellprofile="$HOME/.bash_profile";;
        csh | tcsh) shellprofile="$HOME/.login";;
        *) Log "non-standard shell $SHELL"
@@ -553,7 +553,7 @@ StartFirst()
 
     case ${SHELL##*/} in
 
-      sh | bash | ksh | dtksh)
+      sh | bash | ksh | ksh93 | dtksh)
         dotprofile_errors=`$SHELL -n $shellprofile 2>&1`
         if [ "0" = "$?" ]; then
           source_profile=". $shellprofile"
@@ -589,7 +589,7 @@ StartFirst()
                            PATH=/usr/dt/bin:\$PATH $tooltalk;   \
                            $startup > $dtstart_sessionlogfile 2>&1" ;;
 
-      ksh | dtksh) $SHELL -c "$source_profile; \
+      ksh | ksh93 | dtksh) $SHELL -c "$source_profile; \
                           unset DT; \
                           $dtdbcache; \
                            PATH=/usr/dt/bin:\$PATH $tooltalk;\
index 86f26178c3de2c5cabee3fddac9aacbfc581e9d5..953dd961e752fac31f5d0bb2b45a837478d63810 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+XCOMM!KORNSHELL
 XCOMM $XConsortium: Xsetup.src /main/8 1996/07/02 11:40:32 mgreess $
 XCOMM ##########################################################################
 XCOMM
index 3dcd640d5dd4c282be97d471be355442e827de1d..f3766d30699aba674af9a9de13d7b71941855d8b 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM! /bin/ksh
+XCOMM! KORNSHELL
 XCOMM ##########################################################################
 XCOMM
 XCOMM  Xstartup
index 7d6323da7bd7a56c86e2996254c154da6cd11dfb..2a9a4d13873d3518c600a30f6830ab96881c3170 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+XCOMM!KORNSHELL
 XCOMM $XConsortium: dtlslocale.src /main/6 1996/11/19 11:42:40 drk $
 XCOMM
 XCOMM  Common Desktop Environment
index 2ed69b3fcb2e1f06bad0fe555e84912ff526da46..63baf8aa7c0eb77464b098987fdeb2de56bb546f 100644 (file)
@@ -1,7 +1,8 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:50:24 drk $
 
 CPP_DEFINES =   -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-               -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
+               -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
+               -DKORNSHELL=$(KORNSHELL)
 
 #if defined (SunArchitecture)
 LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
index 6389a2f8d330435e9c5dc74c986995bf9e8e22ed..d8ced32e21764acc26616fc60b7cabf20a75d27a 100755 (executable)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+XCOMM!KORNSHELL
 XCOMM $XConsortium: dtprintegrate.src /main/5 1996/04/23 12:02:04 drk $
 XCOMM ####################################################################
 XCOMM ##  File:              dtprintegrate
index 05292d87101562d59fcbfebf0a7082106d8fa45d..a99fe4b67537650a197c7f02724bf004054f73a5 100644 (file)
@@ -16,6 +16,8 @@ INCLUDES = -I. -I..
 EXTRA_DEFINES = -DHAS_EXCEPTIONS
 #endif
 
+CXXEXTRA_DEFINES = -DKORNSHELL=\"$(KORNSHELL)\"
+
 SRCS =         Application.C   Button.C        ComboBoxObj.C \
        Container.C     Debug.c         Dialog.C \
        DtDND.C         Group.C         HelpSystem.C \
index bf38e4214cf7d88f25d4abed558b1ee04118d64e..ae98a6264ce65b9655841c5fd899c09fdca7033e 100644 (file)
@@ -93,7 +93,7 @@ void MotifThread::CreateThread(MotifUI *_obj, const char *cmd, int _pid,
          dup(m_stdout[1]);
          close(m_stdout[1]);
 
-         execlp("/bin/ksh", "ksh", "-c", cmd, NULL);
+         execlp(KORNSHELL, "ksh", "-c", cmd, NULL);
 
          char *msg = strerror(errno);
          write(1, msg, strlen(msg));
index abfb5324a6198d5a8a53f02bfae324b05ad0f804..6b14444695a2c6f1259428731f6d72ed2d69d6fc 100644 (file)
@@ -12,6 +12,8 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 
 INCLUDES = -I.
 
+CXXEXTRA_DEFINES = -DKORNSHELL=\"$(KORNSHELL)\"
+
 #ifdef RsArchitecture
 EXTRA_DEFINES = -DHAS_EXCEPTIONS
 #endif
index 838009fec74298f2b8faa9d70a5792d4d86e63c9..b3c8d0d5cbc773f8a495b89ab5894e639d905008 100644 (file)
@@ -149,7 +149,7 @@ Invoke::Invoke(const char *command,   // Command to Run
        }
 
       // start the program 
-      execlp("/bin/ksh", "ksh", "-c", command, (char *) 0);
+      execlp(KORNSHELL, "ksh", "-c", command, (char *) 0);
 
       exit(-1);
     }
index cd974c617213c504ae046dfe9876134772537999..5d0846528d46897264054683a29e136b67062222 100644 (file)
@@ -174,6 +174,7 @@ DTSM_CMD5 = $(CDE_INSTALLATION_TOP)/bin/dtaction Dthelpgen_delay
 LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
                    -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
                    -DXBINDIR=$(XPROJECTROOT)/bin \
+                   -DKORNSHELL=$(KORNSHELL) \
                    -DDTSM_CMD1="\"$(DTSM_CMD1)\"" \
                    -DDTSM_CMD2="\"$(DTSM_CMD2)\"" \
                    -DDTSM_CMD4="\"$(DTSM_CMD4)\"" \
index a3824ed9c27388e578a4b62fa9ed28d7f2ad0f9c..69c05188c5b23edb5ec895c1e2faddf27462a8ed 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+XCOMM!KORNSHELL
 
 XCOMM $XConsortium: dtloadresources.src /main/6 1996/04/23 18:51:41 drk $
 XCOMM   (c) Copyright 1996 Digital Equipment Corporation.
index 2710e85fc2677007d58ae0bb64ec3b54d1b399e6..c776c312c4be48ea0738a3550efd25ff16377f73 100644 (file)
@@ -1,7 +1,8 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:52:31 drk $
 
 CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-       -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
+       -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
+       -DKORNSHELL=$(KORNSHELL)
 
 #if defined (SunArchitecture)
 LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
index 72111f89d2a88d7a1b0d55c3470042e2a186b179..01865585ce3e9bc3f620f64f05796992717a8fb9 100644 (file)
@@ -46,7 +46,7 @@ ACTION DtTypes
         ARG_COUNT      0
        TYPE            COMMAND
        WINDOW_TYPE     NO_STDIO
-       EXEC_STRING     CDE_INSTALLATION_TOP/bin/dtterm -e ksh -c '/usr/dt/bin/dttypes;'
+       EXEC_STRING     CDE_INSTALLATION_TOP/bin/dtterm -e KORNSHELL -c '/usr/dt/bin/dttypes;'
        DESCRIPTION     %|nls-9002-#The#|
 }
 ACTION DtTypes
index 8fbb3adad565c677e6822ad80e40d9f2b005ef7c..85ba07dce9e48804f9aea8c70a140947a600a266 100644 (file)
@@ -278,6 +278,18 @@ DATA_CRITERIA KSHELL3
         CONTENT                0 string #! /bin/ksh
         MODE            f&x
 }
+DATA_CRITERIA KSHELL4
+{
+        DATA_ATTRIBUTES_NAME KSHELL
+        CONTENT                0 string #!KORNSHELL
+        MODE            f&x
+}
+DATA_CRITERIA KSHELL5
+{
+        DATA_ATTRIBUTES_NAME KSHELL
+        CONTENT                0 string #! KORNSHELL
+        MODE            f&x
+}
 ACTION Run
 {
         LABEL           %|nls-3-#Run#|
index e11b74138f56cc0fce791ec8dadc9cda2016bc2a..88c25a033addbfabbf304934a7ef89d8c1c33d88 100644 (file)
@@ -173,8 +173,8 @@ ACTION DttermRlogin
         ARG_COUNT      0
         TYPE            COMMAND
         WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     ksh -c 'export _title="%"%|nls-12017-#Hostname:#|"%"; \
-            /usr/dt/bin/dtterm -title "%|nls-12022-#\$_title#|" -e ksh -c \
+        EXEC_STRING     KORNSHELL -c 'export _title="%"%|nls-12017-#Hostname:#|"%"; \
+            /usr/dt/bin/dtterm -title "%|nls-12022-#\$_title#|" -e KORNSHELL -c \
             "echo %|nls-12023-#Trying to#|; \
             rlogin \$_title; sleep 5;";'
        DESCRIPTION     %|nls-12024-#The#|
@@ -189,8 +189,8 @@ ACTION XtermRlogin
         ARG_COUNT      0
         TYPE            COMMAND
         WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     ksh -c 'export _title="%"%|nls-12017-#Hostname:#|"%"; \
-            xterm -title "%|nls-12026-#\$_title#|" -e ksh -c \
+        EXEC_STRING     KORNSHELL -c 'export _title="%"%|nls-12017-#Hostname:#|"%"; \
+            xterm -title "%|nls-12026-#\$_title#|" -e KORNSHELL -c \
             "echo %|nls-12023-#Trying to#|; \
             rlogin \$_title; sleep 5;";'
        DESCRIPTION     %|nls-12027-#The#|