# HG changeset patch # User nanaya # Date 1697662365 -32400 # Node ID 14e2910879f00e2a91ca8be160f2528620263790 # Parent 4f5b040a589c28af9fdf467044abcf90d6683dc5 Combine sunos handler diff -r 4f5b040a589c -r 14e2910879f0 rc/bashrc --- a/rc/bashrc Thu Oct 19 05:52:05 2023 +0900 +++ b/rc/bashrc Thu Oct 19 05:52:45 2023 +0900 @@ -98,25 +98,22 @@ _has_posix_grep=y _uid=$(id -u) -if [ SunOS = "${_os}" ]; then - if [ -f /usr/share/lib/terminfo/s/screen ]; then - export TERMINFO=/usr/share/lib/terminfo - elif [ -f /opt/csw/share/terminfo/s/screen ]; then - export TERMINFO=/opt/csw/share/terminfo - else - unset TERMINFO - export TERM=dtterm - fi - - [ xterm = "${TERM}" ] && export TERM=xterm-256color -fi - case "${_os}" in Linux) _has_gnu_ls=y _has_gnu_grep=y ;; SunOS) + if [ -f /usr/share/lib/terminfo/s/screen ]; then + export TERMINFO=/usr/share/lib/terminfo + elif [ -f /opt/csw/share/terminfo/s/screen ]; then + export TERMINFO=/opt/csw/share/terminfo + else + unset TERMINFO + export TERM=dtterm + fi + + [ xterm = "${TERM}" ] && export TERM=xterm-256color _has_posix_grep=n [ -x /usr/gnu/bin/ls ] && _has_gnu_ls=y [ -x /usr/gnu/bin/grep ] && _has_gnu_grep=y