Moved some aliases and variables in .bash_profile to correct bashrc files.

git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@4 6be0d1a5-5cfe-0310-89b6-964be062b18b

diff --git a/.bash_profile b/.bash_profile
index 35cd3b8..fcecf15 100755 (executable)
--- a/.bash_profile
+++ b/.bash_profile
@@ -2,51 +2,6 @@
 for i in ~/.profile.d/*.bashrc; do . $i; done
 __ps1
 
-unset XMODIFIERS #:-(
-export SSHTERM="urxvt"
-export SSHTERM_TITLE="-title"
-export SSHTERM_EXEC="-e"
-
 if [ "$OSTYPE" = "cygwin" ]; then
   shopt -s nocaseglob
 fi
-
-#[ "$TERM" = "xterm-color" ] && export TERM=xterm-xfree86
-export PATH=~/bin:"$PATH"
-
-function upload() {
-  if [ $# = 0 ]; then
-    echo usage: upload file [file...]
-    return 100
-  fi
-  pwd=$PWD/
-  pwd=${pwd##/home/iain/www/}
-  if echo $pwd | grep -q ^/; then
-    echo not rooted under /home/iain/www
-    unset pwd
-    return 111
-  fi
-# scp ${1+"$@"} 64.176.170.109:/home/iain/$pwd
-  lftp -c "open web1.viagold.net; cd $pwd; mput $@"
-  unset pwd
-}
-
-function download() {
-  if [ $# = 0 ]; then
-    echo usage: download file [file...]
-    return 100
-  fi
-  pwd=$PWD/
-  pwd=${pwd##/home/iain/www/}
-  if echo $pwd | grep -q ^/; then
-    echo not rooted under /home/iain/www
-    unset pwd
-    return 111
-  fi
-# scp ${1+"$@"} 64.176.170.109:/home/iain/$pwd
-  lftp -c "open web1.viagold.net; cd $pwd; mget $@"
-  unset pwd
-}
-alias debug='valgrind --leak-check=yes --show-reachable=yes --num-callers=5 --verbose'
-
-eval `dircolors -b`

diff --git a/.profile.d/aliases.bashrc b/.profile.d/aliases.bashrc
index c1738f6..d0f9bf5 100644 (file)
--- a/.profile.d/aliases.bashrc
+++ b/.profile.d/aliases.bashrc
@@ -2,3 +2,5 @@
 alias l='ls'
 alias ls='/bin/ls $LS_OPTIONS'
 alias vim='vim +syn\ on'
+alias debug='valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=5 --verbose'
+alias svnfind='find . -type f ! -path "*/.svn/*"'

diff --git a/.profile.d/variables.bashrc b/.profile.d/variables.bashrc
index 9ac41f8..d1d7842 100644 (file)
--- a/.profile.d/variables.bashrc
+++ b/.profile.d/variables.bashrc
@@ -8,3 +8,8 @@ export LC_CTYPE=en_GB
 export LS_OPTIONS="--color=auto -F -b"
 export VISUAL=vim
 eval `dircolors`
+export PATH=~/bin:"$PATH"
+unset XMODIFIERS #:-(
+export SSHTERM="urxvt"
+export SSHTERM_TITLE="-title"
+export SSHTERM_EXEC="-e"