Use "type" to test for tools

diff --git a/sys/bashrc b/sys/bashrc
index ce98922e21e8686a42e46e586a65fbbf6c9dc1ba..43358b19fc5dfdb47d8f68f73fdebc564ca7dca5 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -118,7 +118,7 @@ PS1="${PS1}${COLOR_PREPOSTTXT}${PS1_END:->}${COLOR_RESET} "
 [ "$LOGNAME" = "root" ] \
        && PS1="${PS1}${COLOR_PROMPT_ROOT}\\\$${COLOR_RESET} " \
        || PS1="${PS1}${COLOR_PROMPT_USER}\\\$${COLOR_RESET} "
-[ "$(type -t __git_ps1)" ] \
+[ "$(type __git_ps1)" ] \
        && PS1="\$(__git_ps1 '(${COLOR_VCS}%s${COLOR_RESET}) ')${PS1}"
 PS1="${chroot_name:+[${COLOR_CHROOT}$chroot_name${COLOR_RESET}] }${PS1}"
 PS1="${COLOR_RESET}${PS1}"
@@ -142,7 +142,7 @@ fi
 alias "lasth"="last | head -n \`expr \\\$LINES - 2\`"
 
 # Aliases for screen(1), if installed
-type -p screen >/dev/null 2>&1
+type screen >/dev/null 2>&1
 if [ $? -eq 0 ]; then
        alias "s"="screen"
        alias "sr"="screen -dr"
@@ -150,15 +150,16 @@ if [ $? -eq 0 ]; then
 fi
 
 # less(1) filter, if available
-type -p lesspipe >/dev/null 2>&1 && eval `lesspipe`
+type lesspipe >/dev/null 2>&1 \
+       && eval `lesspipe`
 
 # Setup slrn(1) and cleanscore(1), if installed
-type -p cleanscore >/dev/null 2>&1
-[ $? -eq 0 ] && alias slrn="cleanscore -f ~/.slrnscore && slrn"
+type cleanscore >/dev/null 2>&1 \
+       && alias slrn="cleanscore -f ~/.slrnscore && slrn"
 
 # Enable color support of ls(1) and also add handy aliases
 if [ "$TERM" != "dumb" ]; then
-       type -p dircolors >/dev/null 2>&1 && eval `dircolors -b`
+       type dircolors >/dev/null 2>&1 && eval `dircolors -b`
        ls --color / >/dev/null 2>&1
        if [ $? -eq 0 ]; then
                # "GNU style"

diff --git a/sys/profile b/sys/profile
index fad0145bfae2922d08868b42ca9c87fd75b1690c..191cf2964b694d49dcd345e44b975b7ffe758666 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -140,8 +140,7 @@ fi
 [ "$PS1" ] || return
 
 # validate terminal definition
-type -p tset >/dev/null 2>&1
-[ $? -eq 0 ] && eval `tset -s -Q`
+type tset >/dev/null 2>&1 && eval `tset -s -Q`
 
 # generic shell prompt
 [ "$LOGNAME" = "root" ] \
@@ -186,8 +185,7 @@ fi
 # Check filesystem quotas
 mount 2>/dev/null | grep quota >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-       which quota >/dev/null 2>&1
-       [ $? -eq 0 ] && quota -q
+       type quota >/dev/null 2>&1 && quota -q
 fi
 
 # -eof-