comparison rc/bashrc @ 597:fb8bb030a573

Merge
author nanaya <me@myconan.net>
date Wed, 22 Mar 2017 00:29:46 +0900
parents 6114dccd8b75
children 2f6b07f2ab94
comparison
equal deleted inserted replaced
596:283ebb842957 597:fb8bb030a573
81 export BLOCKSIZE=1K 81 export BLOCKSIZE=1K
82 export BLOCK_SIZE=si 82 export BLOCK_SIZE=si
83 83
84 alias ls="ls -F" 84 alias ls="ls -F"
85 alias rd="rdesktop -g 1280x600 -K -a 15 -x m -z -P -r sound:off -r clipboard:CLIPBOARD -5" 85 alias rd="rdesktop -g 1280x600 -K -a 15 -x m -z -P -r sound:off -r clipboard:CLIPBOARD -5"
86 alias man="LANG=C man" 86 alias man="LANG=C LC_ALL=C LC_CTYPE=C man"
87 alias be="bundle exec" 87 alias be="bundle exec"
88 alias ll="ls -l" 88 alias ll="ls -l"
89 alias la="ls -A" 89 alias la="ls -A"
90 90
91 _has_gnu_ls= 91 _has_gnu_ls=
136 _has_gnu_ls=y 136 _has_gnu_ls=y
137 _ls="gls" 137 _ls="gls"
138 fi 138 fi
139 ;; 139 ;;
140 FreeBSD) 140 FreeBSD)
141 # Invalid characters when using en_US.UTF-8.
142 alias man="man -o"
143 # Multi CPU awesomeness. 141 # Multi CPU awesomeness.
144 alias top="top -P" 142 alias top="top -P"
145 # FreeBSD grep is GNU grep 143 # FreeBSD grep is GNU grep
146 _has_gnu_grep=y 144 _has_gnu_grep=y
147 ;; 145 ;;
287 285
288 if command -v tmux > /dev/null 2>&1; then 286 if command -v tmux > /dev/null 2>&1; then
289 case "${_os}" in 287 case "${_os}" in
290 OpenBSD) 288 OpenBSD)
291 # FIXME: OpenBSD version check 289 # FIXME: OpenBSD version check
292 _tmux_conf_ver=1.9 290 _tmux_conf_ver=2.2
293 ;; 291 ;;
294 *) 292 *)
295 case "$(tmux -V 2> /dev/null)" in 293 case "$(tmux -V 2> /dev/null)" in
296 "tmux 2."[2-9]|"tmux "[3-9]"."[0-9]|"tmux "[1-9][0-9][0.9]*"."[0-9]) _tmux_conf_ver=2.2;; 294 "tmux 2."[2-9]|"tmux "[3-9]"."[0-9]|"tmux "[1-9][0-9][0.9]*"."[0-9]) _tmux_conf_ver=2.2;;
297 "tmux 1.9"|"tmux 2."[0-1]) _tmux_conf_ver=1.9;; 295 "tmux 1.9"|"tmux 2."[0-1]) _tmux_conf_ver=1.9;;