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.
49 lines
1.2 KiB
Plaintext
49 lines
1.2 KiB
Plaintext
XCOMM!KORNSHELL
|
|
XCOMM $XConsortium: Xsession.ow.src /main/3 1996/11/19 11:41:19 drk $
|
|
XCOMM ####################################################################
|
|
XCOMM ## File: Xsession.ow
|
|
XCOMM ##
|
|
XCOMM ## Default Location: /usr/dt/config/Xsession.ow
|
|
XCOMM ##
|
|
XCOMM ## Purpose: OpenWindows session start script
|
|
XCOMM ##
|
|
XCOMM ## Invoked by: Solaris Desktop Login Manager (dtlogin)
|
|
XCOMM ##
|
|
XCOMM ## Revision: @(#)Xsession.ow.src 1.4 95/08/10
|
|
XCOMM ##
|
|
XCOMM ## (c) Copyright 1993, 1994, 1995 Sun Microsystems, Inc.
|
|
XCOMM ##
|
|
XCOMM ####################################################################
|
|
|
|
|
|
DTDSPMSG=/usr/dt/bin/dtdspmsg
|
|
|
|
if [ -z "$SESSIONTYPE" ]
|
|
then
|
|
export SESSIONTYPE="altDt"
|
|
fi
|
|
|
|
if [ -z "$DTSTARTIMS" ]
|
|
then
|
|
export DTSTARTIMS="False"
|
|
fi
|
|
|
|
if [ -z "$SDT_ALT_SESSION" ]
|
|
then
|
|
export SDT_ALT_SESSION="/usr/dt/config/Xsession.ow2"
|
|
fi
|
|
|
|
if [ -z "$SDT_ALT_HELLO" ]
|
|
then
|
|
if [ -x $DTDSPMSG ]; then
|
|
export SDT_ALT_HELLO="/usr/dt/bin/dthello -string '`$DTDSPMSG -s 37 /usr/dt/lib/nls/msg/$LANG/dthello.cat 1 'Starting the OpenWindows Desktop'`' &"
|
|
else
|
|
export SDT_ALT_HELLO="/usr/dt/bin/dthello -string 'Starting the OpenWindows Desktop' &"
|
|
fi
|
|
fi
|
|
|
|
export SDT_NO_DSDM=""
|
|
|
|
|
|
/usr/dt/bin/Xsession
|