Move 3 update- scripts into dinstall.functions/tasks proper

[dak.git] / config / homedir / .bashrc

diff --git a/config/homedir/.bashrc b/config/homedir/.bashrc
index 881e7303420b099c8846ade804ed87ff6e0aab77..082270a0030cb4293f4eee8cc58ec28fde38cec7 100644 (file)
--- a/config/homedir/.bashrc
+++ b/config/homedir/.bashrc
@@ -28,13 +28,10 @@ xterm*|rxvt*)
 esac
 
 case "$HOSTNAME" in
-    franck)
+    franck|coccia)
         export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
         ;;
-    morricone)
-        export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports/vars
-        ;;
-    chopin)
+    seger)
         export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
         ;;
     *)
@@ -42,9 +39,11 @@ case "$HOSTNAME" in
         ;;
 esac
 
-. $SCRIPTVARS
+if [[ -n ${SCRIPTVARS} ]]; then
+    . $SCRIPTVARS
+fi
 
-function emacs() {
+function em() {
     export EDITOR=$(which emacs)
 }
 
@@ -58,4 +57,4 @@ export PATH="~/bin/:${PATH}"
 
 alias base='cd ${base}'
 alias config='cd ${configdir}'
-alias psql='LD_PRELOAD=/lib/libreadline.so.5 psql'
+alias ls='ls --color=auto'