From 17a33f0430f01d4a824fc92e077df17f4775e220 Mon Sep 17 00:00:00 2001 From: Marcin Cieslak Date: Thu, 23 Aug 2012 17:49:26 +0200 Subject: [PATCH] Use KORNSHELL variable instead of /bin/ksh 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. --- cde/admin/IntegTools/dbTools/Imakefile | 1 + cde/admin/IntegTools/dbTools/dinstallCDE.src | 6 +++--- cde/admin/IntegTools/dbTools/installCDE.src | 12 ++++++------ cde/admin/IntegTools/dbTools/linksLast | 2 +- cde/admin/IntegTools/dbTools/uncomment | 2 +- cde/programs/dtappintegrate/Imakefile | 3 ++- cde/programs/dtappintegrate/dtappintegrate.src | 2 +- cde/programs/dtfile/Find.c | 2 +- cde/programs/dtfile/Imakefile | 3 ++- cde/programs/dtlogin/config/0015.sun.env.src | 2 +- cde/programs/dtlogin/config/0050.dtxmodmap.src | 2 +- cde/programs/dtlogin/config/0060.dtsysenv.src | 2 +- cde/programs/dtlogin/config/Imakefile | 1 + cde/programs/dtlogin/config/Xreset.src | 2 +- cde/programs/dtlogin/config/Xsession.ow.src | 2 +- cde/programs/dtlogin/config/Xsession.ow2.src | 2 +- cde/programs/dtlogin/config/Xsession.src | 10 +++++----- cde/programs/dtlogin/config/Xsetup.src | 2 +- cde/programs/dtlogin/config/Xstartup.src | 2 +- cde/programs/dtlogin/config/dtlslocale.src | 2 +- cde/programs/dtprintegrate/Imakefile | 3 ++- cde/programs/dtprintegrate/dtprintegrate.src | 2 +- cde/programs/dtprintinfo/libUI/MotifUI/Imakefile | 2 ++ cde/programs/dtprintinfo/libUI/MotifUI/MotifThread.C | 2 +- cde/programs/dtprintinfo/util/Imakefile | 2 ++ cde/programs/dtprintinfo/util/Invoke.C | 2 +- cde/programs/dtsession/Imakefile | 1 + cde/programs/dtsession/dtloadresources.src | 2 +- cde/programs/types/Imakefile | 3 ++- cde/programs/types/unsupported.dt.src | 2 +- cde/programs/types/uxstd.dt.src | 12 ++++++++++++ cde/programs/types/xclients.dt.src | 8 ++++---- 32 files changed, 63 insertions(+), 40 deletions(-) diff --git a/cde/admin/IntegTools/dbTools/Imakefile b/cde/admin/IntegTools/dbTools/Imakefile index 2a9cb490..3885ac43 100644 --- a/cde/admin/IntegTools/dbTools/Imakefile +++ b/cde/admin/IntegTools/dbTools/Imakefile @@ -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) diff --git a/cde/admin/IntegTools/dbTools/dinstallCDE.src b/cde/admin/IntegTools/dbTools/dinstallCDE.src index 78d2e90f..d0dba08d 100755 --- a/cde/admin/IntegTools/dbTools/dinstallCDE.src +++ b/cde/admin/IntegTools/dbTools/dinstallCDE.src @@ -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 } diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src index 9c902787..f6b427ad 100755 --- a/cde/admin/IntegTools/dbTools/installCDE.src +++ b/cde/admin/IntegTools/dbTools/installCDE.src @@ -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." diff --git a/cde/admin/IntegTools/dbTools/linksLast b/cde/admin/IntegTools/dbTools/linksLast index 59dba1cf..d79e6bdd 100755 --- a/cde/admin/IntegTools/dbTools/linksLast +++ b/cde/admin/IntegTools/dbTools/linksLast @@ -1,4 +1,4 @@ -#! /bin/ksh +#! /bin/sh # # Script to move all link refereces in a ".lst" file diff --git a/cde/admin/IntegTools/dbTools/uncomment b/cde/admin/IntegTools/dbTools/uncomment index ac368f6b..699120c4 100755 --- a/cde/admin/IntegTools/dbTools/uncomment +++ b/cde/admin/IntegTools/dbTools/uncomment @@ -1,4 +1,4 @@ -#! /bin/ksh +#! /bin/sh # # Script to remove comments and blank lines from ".lst" files diff --git a/cde/programs/dtappintegrate/Imakefile b/cde/programs/dtappintegrate/Imakefile index 3a4760c0..e91b605a 100644 --- a/cde/programs/dtappintegrate/Imakefile +++ b/cde/programs/dtappintegrate/Imakefile @@ -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),) diff --git a/cde/programs/dtappintegrate/dtappintegrate.src b/cde/programs/dtappintegrate/dtappintegrate.src index 93cc2564..6a4f8ab6 100755 --- a/cde/programs/dtappintegrate/dtappintegrate.src +++ b/cde/programs/dtappintegrate/dtappintegrate.src @@ -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 ################################################################### diff --git a/cde/programs/dtfile/Find.c b/cde/programs/dtfile/Find.c index 094d2854..3398f795 100644 --- a/cde/programs/dtfile/Find.c +++ b/cde/programs/dtfile/Find.c @@ -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)); diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile index 0d0febc2..d8003e71 100644 --- a/cde/programs/dtfile/Imakefile +++ b/cde/programs/dtfile/Imakefile @@ -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 diff --git a/cde/programs/dtlogin/config/0015.sun.env.src b/cde/programs/dtlogin/config/0015.sun.env.src index c44ad7c1..f9af9fae 100644 --- a/cde/programs/dtlogin/config/0015.sun.env.src +++ b/cde/programs/dtlogin/config/0015.sun.env.src @@ -1,4 +1,4 @@ -XCOMM!/bin/ksh +XCOMM!KORNSHELL XCOMM #################################################################### XCOMM ## File: 0015.sun.env.src XCOMM ## diff --git a/cde/programs/dtlogin/config/0050.dtxmodmap.src b/cde/programs/dtlogin/config/0050.dtxmodmap.src index 9e38b07f..480f6f8b 100644 --- a/cde/programs/dtlogin/config/0050.dtxmodmap.src +++ b/cde/programs/dtlogin/config/0050.dtxmodmap.src @@ -1,4 +1,4 @@ -XCOMM!/bin/ksh +XCOMM!KORNSHELL XCOMM #################################################################### XCOMM ## File: 0050.dtxmodmap XCOMM ## diff --git a/cde/programs/dtlogin/config/0060.dtsysenv.src b/cde/programs/dtlogin/config/0060.dtsysenv.src index 973b5664..1b9a93b9 100644 --- a/cde/programs/dtlogin/config/0060.dtsysenv.src +++ b/cde/programs/dtlogin/config/0060.dtsysenv.src @@ -1,4 +1,4 @@ -XCOMM !/usr/bin/ksh +XCOMM !KORNSHELL XCOMM #################################################################### XCOMM ## File: 0060.srcsysenv XCOMM ## diff --git a/cde/programs/dtlogin/config/Imakefile b/cde/programs/dtlogin/config/Imakefile index 0a93f7fb..0c96dade 100644 --- a/cde/programs/dtlogin/config/Imakefile +++ b/cde/programs/dtlogin/config/Imakefile @@ -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 diff --git a/cde/programs/dtlogin/config/Xreset.src b/cde/programs/dtlogin/config/Xreset.src index 55a1e0b8..d2387984 100644 --- a/cde/programs/dtlogin/config/Xreset.src +++ b/cde/programs/dtlogin/config/Xreset.src @@ -1,4 +1,4 @@ -XCOMM! /bin/ksh +XCOMM! KORNSHELL XCOMM ########################################################################## XCOMM XCOMM Xreset diff --git a/cde/programs/dtlogin/config/Xsession.ow.src b/cde/programs/dtlogin/config/Xsession.ow.src index 7688e04b..9d277c7b 100644 --- a/cde/programs/dtlogin/config/Xsession.ow.src +++ b/cde/programs/dtlogin/config/Xsession.ow.src @@ -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 diff --git a/cde/programs/dtlogin/config/Xsession.ow2.src b/cde/programs/dtlogin/config/Xsession.ow2.src index 631de602..340eee57 100644 --- a/cde/programs/dtlogin/config/Xsession.ow2.src +++ b/cde/programs/dtlogin/config/Xsession.ow2.src @@ -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 diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src index 02f14160..fc62821f 100644 --- a/cde/programs/dtlogin/config/Xsession.src +++ b/cde/programs/dtlogin/config/Xsession.src @@ -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;\ diff --git a/cde/programs/dtlogin/config/Xsetup.src b/cde/programs/dtlogin/config/Xsetup.src index 86f26178..953dd961 100644 --- a/cde/programs/dtlogin/config/Xsetup.src +++ b/cde/programs/dtlogin/config/Xsetup.src @@ -1,4 +1,4 @@ -XCOMM!/bin/ksh +XCOMM!KORNSHELL XCOMM $XConsortium: Xsetup.src /main/8 1996/07/02 11:40:32 mgreess $ XCOMM ########################################################################## XCOMM diff --git a/cde/programs/dtlogin/config/Xstartup.src b/cde/programs/dtlogin/config/Xstartup.src index 3dcd640d..f3766d30 100644 --- a/cde/programs/dtlogin/config/Xstartup.src +++ b/cde/programs/dtlogin/config/Xstartup.src @@ -1,4 +1,4 @@ -XCOMM! /bin/ksh +XCOMM! KORNSHELL XCOMM ########################################################################## XCOMM XCOMM Xstartup diff --git a/cde/programs/dtlogin/config/dtlslocale.src b/cde/programs/dtlogin/config/dtlslocale.src index 7d6323da..2a9a4d13 100644 --- a/cde/programs/dtlogin/config/dtlslocale.src +++ b/cde/programs/dtlogin/config/dtlslocale.src @@ -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 diff --git a/cde/programs/dtprintegrate/Imakefile b/cde/programs/dtprintegrate/Imakefile index 2ed69b3f..63baf8aa 100644 --- a/cde/programs/dtprintegrate/Imakefile +++ b/cde/programs/dtprintegrate/Imakefile @@ -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 diff --git a/cde/programs/dtprintegrate/dtprintegrate.src b/cde/programs/dtprintegrate/dtprintegrate.src index 6389a2f8..d8ced32e 100755 --- a/cde/programs/dtprintegrate/dtprintegrate.src +++ b/cde/programs/dtprintegrate/dtprintegrate.src @@ -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 diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Imakefile b/cde/programs/dtprintinfo/libUI/MotifUI/Imakefile index 05292d87..a99fe4b6 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/Imakefile +++ b/cde/programs/dtprintinfo/libUI/MotifUI/Imakefile @@ -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 \ diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/MotifThread.C b/cde/programs/dtprintinfo/libUI/MotifUI/MotifThread.C index bf38e421..ae98a626 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/MotifThread.C +++ b/cde/programs/dtprintinfo/libUI/MotifUI/MotifThread.C @@ -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)); diff --git a/cde/programs/dtprintinfo/util/Imakefile b/cde/programs/dtprintinfo/util/Imakefile index abfb5324..6b144446 100644 --- a/cde/programs/dtprintinfo/util/Imakefile +++ b/cde/programs/dtprintinfo/util/Imakefile @@ -12,6 +12,8 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) INCLUDES = -I. +CXXEXTRA_DEFINES = -DKORNSHELL=\"$(KORNSHELL)\" + #ifdef RsArchitecture EXTRA_DEFINES = -DHAS_EXCEPTIONS #endif diff --git a/cde/programs/dtprintinfo/util/Invoke.C b/cde/programs/dtprintinfo/util/Invoke.C index 838009fe..b3c8d0d5 100644 --- a/cde/programs/dtprintinfo/util/Invoke.C +++ b/cde/programs/dtprintinfo/util/Invoke.C @@ -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); } diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile index cd974c61..5d084652 100644 --- a/cde/programs/dtsession/Imakefile +++ b/cde/programs/dtsession/Imakefile @@ -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)\"" \ diff --git a/cde/programs/dtsession/dtloadresources.src b/cde/programs/dtsession/dtloadresources.src index a3824ed9..69c05188 100644 --- a/cde/programs/dtsession/dtloadresources.src +++ b/cde/programs/dtsession/dtloadresources.src @@ -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. diff --git a/cde/programs/types/Imakefile b/cde/programs/types/Imakefile index 2710e85f..c776c312 100644 --- a/cde/programs/types/Imakefile +++ b/cde/programs/types/Imakefile @@ -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 diff --git a/cde/programs/types/unsupported.dt.src b/cde/programs/types/unsupported.dt.src index 72111f89..01865585 100644 --- a/cde/programs/types/unsupported.dt.src +++ b/cde/programs/types/unsupported.dt.src @@ -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 diff --git a/cde/programs/types/uxstd.dt.src b/cde/programs/types/uxstd.dt.src index 8fbb3ada..85ba07dc 100644 --- a/cde/programs/types/uxstd.dt.src +++ b/cde/programs/types/uxstd.dt.src @@ -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#| diff --git a/cde/programs/types/xclients.dt.src b/cde/programs/types/xclients.dt.src index e11b7413..88c25a03 100644 --- a/cde/programs/types/xclients.dt.src +++ b/cde/programs/types/xclients.dt.src @@ -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#| -- 2.25.1