git://git.jankratochvil.net
/
nethome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.bashrc: +compatibility with Alpine Linux: ls !-bF
[nethome.git]
/
.bashrc
diff --git
a/.bashrc
b/.bashrc
index
2bd97fb
..
0ead09c
100644
(file)
--- a/
.bashrc
+++ b/
.bashrc
@@
-128,8
+128,13
@@
unalias 2>/dev/null fgrep # /etc/profile.d/colorgrep.sh
# `eval':
eval '
function grep {(unset grep; ( ulimitme; grep "$@"; ); );}
# `eval':
eval '
function grep {(unset grep; ( ulimitme; grep "$@"; ); );}
- function ls {(unset ls; ( ls -bF "$@"; ); );}
- function l { ls -lbF "$@"; }
+ if ls -d -bF / &>/dev/null;then
+ function ls {(unset ls; ( ls -bF "$@"; ); );}
+ else
+ # Alpine Linux
+ function ls {(unset ls; ( ls "$@"; ); );}
+ fi
+ function l { ls -l "$@"; }
if which vim &>/dev/null;then
alias vi="vim"
else
if which vim &>/dev/null;then
alias vi="vim"
else
@@
-209,7
+214,8
@@
export HISTSIZE=10000000
export HISTFILESIZE="$HISTSIZE"
export GDBHISTFILE="$HOME/.gdb_history"
export CVS_RSH="ssh"
export HISTFILESIZE="$HISTSIZE"
export GDBHISTFILE="$HOME/.gdb_history"
export CVS_RSH="ssh"
-export TZ="Europe/Prague"
+export TZ="Asia/Manila"
+#export TZ="Europe/Prague"
#export TZ="Canada/Eastern"
export PYTHONUNBUFFERED=1
export ASAN_OPTIONS=detect_leaks=0
#export TZ="Canada/Eastern"
export PYTHONUNBUFFERED=1
export ASAN_OPTIONS=detect_leaks=0
@@
-394,7
+400,6
@@
function rpmsrclist
}
function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
function gitcommit { git commit -a --allow-empty-message -m '' "$@"; }
}
function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
function gitcommit { git commit -a --allow-empty-message -m '' "$@"; }
-function git {(unset git;if [ "$1" = "checkout" ];then shift;git checkout --ignore-other-worktrees "$@";else git "$@";fi)}
function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"; );}
function swap() {( set -ex;local TMPFILE=tmp.$$;[ $# = 2 ] && mv "$1" $TMPFILE && mv "$2" "$1" && mv $TMPFILE "$2" && echo done )}
alias gthumb='rm -rf ~/.cache/thumbnails/fail/;gthumb'
function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"; );}
function swap() {( set -ex;local TMPFILE=tmp.$$;[ $# = 2 ] && mv "$1" $TMPFILE && mv "$2" "$1" && mv $TMPFILE "$2" && echo done )}
alias gthumb='rm -rf ~/.cache/thumbnails/fail/;gthumb'