# HG changeset patch # User nanaya # Date 1561894305 -32400 # Node ID 7bcc81f6b21039317ce5cd0e0e5c2a5f90288344 # Parent 84791ac85abdfde82f182dee3b2dc70b6ec34a19 Correct os version check diff -r 84791ac85abd -r 7bcc81f6b210 rc/bashrc --- a/rc/bashrc Sun Jun 30 20:25:30 2019 +0900 +++ b/rc/bashrc Sun Jun 30 20:31:45 2019 +0900 @@ -30,6 +30,7 @@ export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/games" _os="$(uname -s)" +_os_r="$(uname -r)" # pkgsrc if test -d /usr/pkg; then @@ -287,12 +288,16 @@ if command -v tmux > /dev/null 2>&1; then case "${_os}" in - "OpenBSD "*" "6.[5-9]" "*|"OpenBSD "*" "[7-9].[0-9]" "*|"OpenBSD "*" "[1-9][0-9][0-9]*.[0-9]" "*) - _tmux_conf_ver=2.9 - ;; OpenBSD) - # probably not accurate enough but I don't want to dig through all the previous versions. - _tmux_conf_ver=2.2 + case "${_os_r}" in + 6.[5-9]|[7-9].[0-9]|[1-9][0-9][0-9]*.[0-9]) + _tmux_conf_ver=2.9 + ;; + *) + # probably not accurate enough but I don't want to dig through all the previous versions. + _tmux_conf_ver=2.2 + ;; + esac ;; *) case "$(tmux -V 2> /dev/null)" in @@ -309,5 +314,6 @@ fi unset _os +unset _os_r [ -f "${HOME}/.ec.bash.after" ] && . "${HOME}/.ec.bash.after"