mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-02-20 03:02:29 +01:00
Merge remote-tracking branch 'upstream/master'
Conflicts: tools/install.sh
This commit is contained in:
commit
316c46767e
12 changed files with 253 additions and 170 deletions
|
|
@ -1,5 +1,5 @@
|
|||
function zsh_stats() {
|
||||
history | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl | head -n20
|
||||
fc -l 1 | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl | head -n20
|
||||
}
|
||||
|
||||
function uninstall_oh_my_zsh() {
|
||||
|
|
|
|||
23
lib/grep.zsh
23
lib/grep.zsh
|
|
@ -3,11 +3,22 @@
|
|||
# Examples: http://rubyurl.com/ZXv
|
||||
#
|
||||
|
||||
# avoid VCS folders
|
||||
GREP_OPTIONS=
|
||||
for PATTERN in .cvs .git .hg .svn; do
|
||||
GREP_OPTIONS+="--exclude-dir=$PATTERN "
|
||||
done
|
||||
GREP_OPTIONS+="--color=auto"
|
||||
GREP_OPTIONS="--color=auto"
|
||||
|
||||
# avoid VCS folders (if the necessary grep flags are available)
|
||||
grep-flag-available() {
|
||||
echo | grep $1 "" >/dev/null 2>&1
|
||||
}
|
||||
if grep-flag-available --exclude-dir=.cvs; then
|
||||
for PATTERN in .cvs .git .hg .svn; do
|
||||
GREP_OPTIONS+=" --exclude-dir=$PATTERN"
|
||||
done
|
||||
elif grep-flag-available --exclude=.cvs; then
|
||||
for PATTERN in .cvs .git .hg .svn; do
|
||||
GREP_OPTIONS+=" --exclude=$PATTERN"
|
||||
done
|
||||
fi
|
||||
unfunction grep-flag-available
|
||||
|
||||
export GREP_OPTIONS="$GREP_OPTIONS"
|
||||
export GREP_COLOR='1;32'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue