From: short <>
Date: Wed, 26 Sep 2001 17:11:27 +0000 (+0000)
Subject: +CVSROOT: now also "$HOME/cvs"
X-Git-Tag: rh72~39
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=324bac0451e3b6cbd29334c5d4237923c582837e;ds=sidebyside

+CVSROOT: now also "$HOME/cvs"
+"$HOME/.bashrc.local" executed if exists
+"cvs{diff,update}{,i}" user functions
---

diff --git a/.bashrc b/.bashrc
index 10d1852..9aefd77 100644
--- a/.bashrc
+++ b/.bashrc
@@ -3,7 +3,7 @@ if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 function _bash_profile_addpath	# variable,dirpathname
 {
 	if [ '!' -d "$2" ];then return;fi
-	if [ -z "`eval "echo \\${$1}"`" ];then
+	if [ -n "$3" -o -z "`eval "echo \\${$1}"`" ];then
 		eval "$1='$2'"
 	else
 		# we want to override any original directories, place dirpathname first!
@@ -13,11 +13,13 @@ function _bash_profile_addpath	# variable,dirpathname
 }
 
 _bash_profile_addpath PATH            "$HOME/bin"
+_bash_profile_addpath PATH            "$HOME/sbin"
 _bash_profile_addpath LD_LIBRARY_PATH "$HOME/lib"
 _bash_profile_addpath MANPATH         "$HOME/man"
 _bash_profile_addpath PERLLIB         "$HOME/lib/perl5/site_perl"
 _bash_profile_addpath PERLLIB         "$HOME/lib/perl5/site_perl/`perl -V:version|cut -d "'" -f 2`"
-unset CVSROOT;_bash_profile_addpath CVSROOT "$HOME/pserver/cvs"
+_bash_profile_addpath CVSROOT         "$HOME/cvs" single
+_bash_profile_addpath CVSROOT         "$HOME/pserver/cvs" single
 
 alias ls='ls -bF'
 alias l='ls -lbF'
@@ -35,4 +37,11 @@ export TMOUT=900
 export EDITOR='vim'
 export LC_CTYPE=cs_CZ.ISO-8859-2
 
+function cvsdiff    { cvs diff   "$@" 2>&1|             less; }; export -f cvsdiff
+function cvsdiffi   { cvs diff   "$@" 2>&1|grep -v '^?'|less; }; export -f cvsdiffi
+function cvsupdate  { cvs update "$@" 2>&1|             less; }; export -f cvsupdate
+function cvsupdatei { cvs update "$@" 2>&1|grep -v '^?'|less; }; export -f cvsupdatei
+
 ulimit -c 0
+
+if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi