Paul McLanahan avatar Paul McLanahan committed 53c4cbe

Updated some bash and hg stuff to be better and/or more compatible across machines.

Comments (0)

Files changed (3)

 #export PS1='$(hg_ps1)${GREEN}\u${D}@${ORANGE}\h${D}:${CYAN}\w${D}$ '
 export PS1='\[${GREEN}\]\u\[${D}\]@\[${ORANGE}\]\h\[${D}\]:\[${CYAN}\]\w\[${D}\]$ '
 
+if [ ! -z "$SCHROOT_SESSION_ID" ]; then
+    schroot_name=`echo $SCHROOT_SESSION_ID | awk -F - '{print $1}'`
+    PS1="[\[${RED}\]$schroot_name\[${D}\]]$PS1"
+fi
+
 # If this is an xterm set the title to user@host:dir
 case "$TERM" in
 xterm*|rxvt*)
 # Welcome Message
 echo -e ""
 echo -ne "Today is "; date
-echo -e ""; cal;
-echo -ne "Up time: ";uptime | awk /'up/ {print $3,$4}'
+if [ -x /usr/bin/cal ]; then
+    echo -e ""; cal;
+fi
+echo
+echo -ne "Up time:"
+uptime 
 echo "";
 
 if [ -x /usr/games/fortune ]; then
 color =
 purge =
 bookmarks =
+hggit =
 rebase =
 mq =
 graphlog = 
 record =
 pager =
 extdiff =
+hgshelve = ~/.hgext/hgshelve.py
 
 [extdiff]
 cmd.kdiff3 =
 diff.trailingwhitespace = white_background
 
 [ui]
-username = Paul McLanahan <pmclanahan@gmail.com>
+username = Paul McLanahan <paul@mclanahan.net>
 ssh = ssh -C
 ignore = ~/.hgignore
 editor = vim

dotfiles/.profile

     PATH="~/.local/bin:${PATH}"
 fi
 
+if [ -d /var/lib/gems/1.8/bin ]; then
+    PATH="${PATH}:/var/lib/gems/1.8/bin"
+fi
+
 export JAVA_HOME=/usr/lib/jvm/java-6-sun
 export JDK_HOME=$JAVA_HOME
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.