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
+grep-2.4.2 (Debian woody/3.0) compatibility.
[nethome.git]
/
.bashrc
diff --git
a/.bashrc
b/.bashrc
index
cb16073
..
880fe75
100644
(file)
--- a/
.bashrc
+++ b/
.bashrc
@@
-10,7
+10,8
@@
if [ -n "$_home_short_dotbashrc_norc" -o "${TERM#norc-}" != "$TERM" ];then
export _home_short_dotbashrc=true
fi
export _home_short_dotbashrc=true
fi
-if [ -z "$_home_short_dotbashrc" ];then
+# "$PS1" for interactive shells detection.
+if [ -n "$PS1" -a -z "$_home_short_dotbashrc" ];then
# We permit later reinitialization by unsetting it.
# During our execution we forbid spawning to prevent deadlock by:
# source /etc/bashrc
# We permit later reinitialization by unsetting it.
# During our execution we forbid spawning to prevent deadlock by:
# source /etc/bashrc
@@
-126,7
+127,11
@@
alias ls='ls -bF'
alias l='ls -lbF'
alias maple="ssh -t vega.fjfi.cvut.cz maple"
#alias cc='cc -I/home/short/include'
alias l='ls -lbF'
alias maple="ssh -t vega.fjfi.cvut.cz maple"
#alias cc='cc -I/home/short/include'
-alias vi='vim'
+if which vim &>/dev/null;then
+ alias vi='vim'
+else
+ echo >&2 'WARNING: No vim(1).'
+fi
alias grepb='grep --binary-files=binary'
alias L='lynx'
alias chown='chown --no-dereference'
alias grepb='grep --binary-files=binary'
alias L='lynx'
alias chown='chown --no-dereference'
@@
-139,6
+144,8
@@
alias cvsignoresall='cvsutil --ignores --workings --print'
alias cvsignoresrm='cvsutil --ignores --rm'
alias cvsignoresrmall='cvsutil --ignores --workings --rm'
alias cvsignoresallrm='cvsutil --ignores --workings --rm'
alias cvsignoresrm='cvsutil --ignores --rm'
alias cvsignoresrmall='cvsutil --ignores --workings --rm'
alias cvsignoresallrm='cvsutil --ignores --workings --rm'
+alias svnignoresall='svn status |sed -n "s/^[?] //p"'
+alias svnignoresallrm='svn status |sed -n "s/^[?] //p"|tr "\n" "\0"|xargs -0 rm -rf'
[ "`uname`" = "SunOS" -a -x $HOME/bin/rpm-by-pkg ] && alias rpm='rpm-by-pkg'
alias disass='objdump -D --target=binary --architecture=i386'
alias cal='cal -m'
[ "`uname`" = "SunOS" -a -x $HOME/bin/rpm-by-pkg ] && alias rpm='rpm-by-pkg'
alias disass='objdump -D --target=binary --architecture=i386'
alias cal='cal -m'
@@
-166,7
+173,10
@@
for file in $HOME/.bookmarks.html;do
export WWW_HOME="file://$HOME/"
[ -r $file ] && export WWW_HOME="file://$file"
done
export WWW_HOME="file://$HOME/"
[ -r $file ] && export WWW_HOME="file://$file"
done
-export GREP_OPTIONS="--binary-files=without-match --directories=skip --exclude=tags --exclude=TAGS --exclude=CVS"
+export GREP_OPTIONS="--binary-files=without-match --directories=skip"
+if echo x|GREP_OPTIONS="--exclude=y" grep -q x 2>/dev/null;then
+ export GREP_OPTIONS="$GREP_OPTIONS --exclude=tags --exclude=TAGS --exclude=CVS"
+fi
if [ -n "$PS1" ];then # set only in interactive sessions
export PS1='[bash]${LOGNAME}@${HOSTNAME}:${PWD}# '
export PS1='\[\017\]'"$PS1" # \017=std charmap
if [ -n "$PS1" ];then # set only in interactive sessions
export PS1='[bash]${LOGNAME}@${HOSTNAME}:${PWD}# '
export PS1='\[\017\]'"$PS1" # \017=std charmap
@@
-190,7
+200,6
@@
if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp;th
fi
_selfabs=
[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_SOURCE"
fi
_selfabs=
[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_SOURCE"
-[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_ENV"
[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$PWD/.bashrc"
[ -r "$_selfabs" ] || unset _selfabs
[ -n "$_selfabs" ] && export VIMINIT="source `echo "$_selfabs"|sed 's/[.]bashrc$/.vimrc/'`"
[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$PWD/.bashrc"
[ -r "$_selfabs" ] || unset _selfabs
[ -n "$_selfabs" ] && export VIMINIT="source `echo "$_selfabs"|sed 's/[.]bashrc$/.vimrc/'`"
@@
-234,7
+243,7
@@
function mi { (
); };export -f mi
function ctags {(unset ctags;
if [ $# -ne 0 -a '(' $# -ne 1 -o "$1" '!=' "--c-types=+px" ')' ];then ctags "$@";else
); };export -f mi
function ctags {(unset ctags;
if [ $# -ne 0 -a '(' $# -ne 1 -o "$1" '!=' "--c-types=+px" ')' ];then ctags "$@";else
- find -name testsuite -prune -o \
+ find -name testsuite -prune -o
-name .pc -prune -o -name .svn -o
\
-type f -a '!' -name tags -a '!' -name TAGS -a '(' -false \
-o -name "*.[chC]" \
-o -name "*.cc" \
-type f -a '!' -name tags -a '!' -name TAGS -a '(' -false \
-o -name "*.[chC]" \
-o -name "*.cc" \
@@
-242,8
+251,9
@@
function ctags {(unset ctags;
-o -name "*.java" \
-o -name "*.p[lm]" \
-o -name "*.py" \
-o -name "*.java" \
-o -name "*.p[lm]" \
-o -name "*.py" \
+ -o -name "*.exp" \
')' \
')' \
- |ctags --file-tags -L - "$@"
+ |ctags --file-tags -L -
--langmap=Tcl:+.exp
"$@"
fi; );}; export -f ctags
function ctagsh { ctags "--c-types=+px"; }; export -f ctagsh
function cpan {(unset cpan; if [ $# = 0 ];then cpan;else perl -MCPAN -e "install qw($*);";fi; );}; export -f cpan
fi; );}; export -f ctags
function ctagsh { ctags "--c-types=+px"; }; export -f ctagsh
function cpan {(unset cpan; if [ $# = 0 ];then cpan;else perl -MCPAN -e "install qw($*);";fi; );}; export -f cpan
@@
-257,7
+267,7
@@
function diffc { diff -u "$@"|grep -v '^\(Only in \|Binary files\)'; }; export -
function diffi { diffc -X ~/.diffi.list "$@"; }; export -f diffi
function cvs {(unset cvs;
local _opts _opts_d _now _line _o
function diffi { diffc -X ~/.diffi.list "$@"; }; export -f diffi
function cvs {(unset cvs;
local _opts _opts_d _now _line _o
- if grep -iw
"sources.redhat.com:/cvs/src"
CVS/Root &>/dev/null;then _opts_d="";else _opts_d="-d";fi
+ if grep -iw
'\(sources.redhat.com\|sourceware.org\):/cvs/src'
CVS/Root &>/dev/null;then _opts_d="";else _opts_d="-d";fi
_now=false
_line=""
_opts=""
_now=false
_line=""
_opts=""