diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2017-07-15 07:11:43 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2017-07-15 07:11:43 +0000 |
| commit | f3a455e5a7fece664f0409e84cdea50e6f60cd02 (patch) | |
| tree | edd58a070e956cac7bd84994c841e4f891446b6a /etc | |
| parent | 2a12e3afb11439e1dd28c1c2909e07f14b6566f9 (diff) | |
Replace some `eval` with $(eval) for consistency and use
parameter expansion instead of basename(1). From Raf Czlonka
ok rpe
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ksh.kshrc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/ksh.kshrc b/etc/ksh.kshrc index 1222d5d0aa6..e3dcd0e5bf4 100644 --- a/etc/ksh.kshrc +++ b/etc/ksh.kshrc @@ -1,5 +1,5 @@ : -# $OpenBSD: ksh.kshrc,v 1.27 2016/09/14 18:34:51 rpe Exp $ +# $OpenBSD: ksh.kshrc,v 1.28 2017/07/15 07:11:42 tb Exp $ # # NAME: # ksh.kshrc - global initialization for ksh @@ -39,7 +39,7 @@ case "$-" in 0) PS1S='# ';; esac PS1S=${PS1S:-'$ '} - HOSTNAME=${HOSTNAME:-`uname -n`} + HOSTNAME=${HOSTNAME:-$(uname -n)} HOST=${HOSTNAME%%.*} PROMPT="$USER:!$PS1S" @@ -49,8 +49,8 @@ case "$-" in PS1=$PPROMPT # $TTY is the tty we logged in on, # $tty is that which we are in now (might by pty) - tty=`tty` - tty=`basename $tty` + tty=$(tty) + tty=${tty##*/} TTY=${TTY:-$tty} # $console is the system console device console=$(sysctl kern.consdev) @@ -117,7 +117,7 @@ case "$-" in alias o='fg %-' alias df='df -k' alias du='du -k' - alias rsize='eval `resize`' + alias rsize='eval $(resize)' ;; *) # non-interactive ;; @@ -142,6 +142,6 @@ function pre_path { } # if $1 is in path, remove it function del_path { - no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: | - sed -e "s;:$1:;:;g" -e "s;^:;;" -e "s;:\$;;"` + no_path $* || eval ${2:-PATH}=$(eval echo :'$'${2:-PATH}: | + sed -e "s;:$1:;:;g" -e "s;^:;;" -e "s;:\$;;") } |