# HG changeset patch # User huston@80426f53-59d1-405d-934b-f07cd76f4a1a # Date 1297348779 0 # Node ID 8d204a89b98156d56caaf678dcaa7c485c2558b4 # Parent 1a825373dc2569b0618dc65b40496160419060ef * Local Perl install paths weren't quite right - they assumed a link existed which didn't necessarily, and didn't work for 64-bit installs either. * Removed bynarr remote desktop alias (VNC will be easier, but it's a VM now anyway and not on all the time) * Added gala VNC alias * Added joshua to the toodledo block diff -r 1a825373dc25 -r 8d204a89b981 .bash_aliases --- a/.bash_aliases Mon Oct 25 19:51:21 2010 +0000 +++ b/.bash_aliases Thu Feb 10 14:39:39 2011 +0000 @@ -61,10 +61,10 @@ alias x='ssh xanadu.astro.princeton.edu' # Remote desktop/VNC -alias bynarr='rdesktop -a 16 bynarr.astro.princeton.edu -g 1593x1109' eval "alias harmonic='ssh -L9910:harmonic:5900 -f joshua.srhuston.net \"/sbin/ether-wake 00:11:24:3c:3a:e8 ; sleep 30\"; sleep 10; ${VNCVIEWER}localhost:9910 &'" +eval "alias xanadu='ssh -L9920:localhost:5900 -f xanadu.astro.princeton.edu \"sleep 300\"; ${VNCVIEWER}localhost:9920 &'" eval "alias milton='ssh -L9930:milton:5900 -f joshua.srhuston.net \"/sbin/ether-wake 00:17:f2:01:d2:3c ; sleep 30\"; sleep 10; ${VNCVIEWER}localhost:9930 &'" -eval "alias xanadu='ssh -L9920:localhost:5900 -f xanadu.astro.princeton.edu \"sleep 300\"; ${VNCVIEWER}localhost:9920 &'" +eval "alias gala='ssh -L9940:gala:5900 -f joshua.srhuston.net \"/sbin/ether-wake 00:14:51:0d:94:e4 ; sleep 30\"; sleep 10; ${VNCVIEWER}localhost:9940 &'" # Programs alias atari='atari800 -height 800 -width 600' @@ -95,7 +95,7 @@ TOODLEDO_CMDS="toodledo tasks @Work; toodledo tasks @Anywhere" ;; - milton) + milton|joshua) TOODLEDO_CMDS="toodledo tasks @Home; toodledo tasks @Anywhere" ;; diff -r 1a825373dc25 -r 8d204a89b981 .bashrc --- a/.bashrc Mon Oct 25 19:51:21 2010 +0000 +++ b/.bashrc Thu Feb 10 14:39:39 2011 +0000 @@ -56,8 +56,25 @@ # Local Perl install if [ -d $HOME/perl ]; then - [[ "$PERL5LIB" =~ "(^|:)$HOME/perl($|:)" ]] || \ - export PERL5LIB=$HOME/perl${PERL5LIB:+:$PERL5LIB} + if [ -d $HOME/perl/lib/perl5 ]; then + [[ "$PERL5LIB" =~ "(^|:)$HOME/perl/lib/perl5($|:)" ]] || \ + export PERL5LIB=$HOME/perl/lib/perl5${PERL5LIB:+:$PERL5LIB} + fi + + if [ -d $HOME/perl/lib64/perl5 ]; then + [[ "$PERL5LIB" =~ "(^|:)$HOME/perl/lib64/perl5($|:)" ]] || \ + export PERL5LIB=$HOME/perl/lib64/perl5${PERL5LIB:+:$PERL5LIB} + fi + + if [ -d $HOME/perl/lib/perl5/site_perl ]; then + [[ "$PERL5LIB" =~ "(^|:)$HOME/perl/lib/perl5/site_perl($|:)" ]] || \ + export PERL5LIB=$HOME/perl/lib/perl5/site_perl${PERL5LIB:+:$PERL5LIB} + fi + + if [ -d $HOME/perl/lib64/perl5/site_perl ]; then + [[ "$PERL5LIB" =~ "(^|:)$HOME/perl/lib64/perl5/site_perl($|:)" ]] || \ + export PERL5LIB=$HOME/perl/lib64/perl5/site_perl${PERL5LIB:+:$PERL5LIB} + fi if [ -d $HOME/perl/share/man ]; then [[ "$MANPATH" =~ "(^|:)$HOME/perl/share/man($|:)" ]] || \