Browse Source

Replace some `eval` with $(eval) for consistency and use

parameter expansion instead of basename(1). From Raf Czlonka
ok rpe
OPENBSD_6_2
tb 7 years ago
parent
commit
c29a36dba0
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      src/etc/ksh.kshrc

+ 7
- 7
src/etc/ksh.kshrc View File

@ -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: # NAME:
# ksh.kshrc - global initialization for ksh # ksh.kshrc - global initialization for ksh
@ -39,7 +39,7 @@ case "$-" in
0) PS1S='# ';; 0) PS1S='# ';;
esac esac
PS1S=${PS1S:-'$ '} PS1S=${PS1S:-'$ '}
HOSTNAME=${HOSTNAME:-`uname -n`}
HOSTNAME=${HOSTNAME:-$(uname -n)}
HOST=${HOSTNAME%%.*} HOST=${HOSTNAME%%.*}
PROMPT="$USER:!$PS1S" PROMPT="$USER:!$PS1S"
@ -49,8 +49,8 @@ case "$-" in
PS1=$PPROMPT PS1=$PPROMPT
# $TTY is the tty we logged in on, # $TTY is the tty we logged in on,
# $tty is that which we are in now (might by pty) # $tty is that which we are in now (might by pty)
tty=`tty`
tty=`basename $tty`
tty=$(tty)
tty=${tty##*/}
TTY=${TTY:-$tty} TTY=${TTY:-$tty}
# $console is the system console device # $console is the system console device
console=$(sysctl kern.consdev) console=$(sysctl kern.consdev)
@ -117,7 +117,7 @@ case "$-" in
alias o='fg %-' alias o='fg %-'
alias df='df -k' alias df='df -k'
alias du='du -k' alias du='du -k'
alias rsize='eval `resize`'
alias rsize='eval $(resize)'
;; ;;
*) # non-interactive *) # non-interactive
;; ;;
@ -142,6 +142,6 @@ function pre_path {
} }
# if $1 is in path, remove it # if $1 is in path, remove it
function del_path { 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;:\$;;")
} }

Loading…
Cancel
Save