[Assorted-commits] SF.net SVN: assorted:[1594] shell-tools/trunk/src/bash-commons/bashrc.bash

[<yan...@us...>]

Revision: 1594
          http://assorted.svn.sourceforge.net/assorted/?rev=1594&view=rev
Author:   yangzhang
Date:     2010-04-01 18:16:18 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
added local gem prefix for paths

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/bashrc.bash

Modified: shell-tools/trunk/src/bash-commons/bashrc.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/bashrc.bash	2010-04-01 18:15:53 UTC (rev 1593)
+++ shell-tools/trunk/src/bash-commons/bashrc.bash	2010-04-01 18:16:18 UTC (rev 1594)
@@ -46,7 +46,8 @@
 
 # Back up or restore vars.
 function reset_var {
-    local var="$1" orig="ORIG_$var"
+    local var="$1"
+    local orig="ORIG_$var"
     if ! is_declared "$orig" ; then # eval [[ ! \"\$$orig\" ]] ; then
         eval export $orig=\"\$$var\"
     else
@@ -82,7 +83,7 @@
         if [[ "${subdir:0:1}" == / || "$subdir" == '' ]] ; then
             pieces=( "${pieces[@]}" "$subdir" )
         else
-            pieces=( "${pieces[@]}" {"$USER_PREFIX","$USER_TOAST_PREFIX","$USER_CABAL_PREFIX","$GLOBAL_PREFIX","$GLOBAL_TOAST_PREFIX"}/"$subdir" )
+            pieces=( "${pieces[@]}" {"$GEM_PREFIX","$USER_PREFIX","$USER_TOAST_PREFIX","$USER_CABAL_PREFIX","$GLOBAL_PREFIX","$GLOBAL_TOAST_PREFIX"}/"$subdir" )
         fi
     done
     prepend_var "$var" "${pieces[@]}"
@@ -90,6 +91,7 @@
 
 # general
 
+export GEM_PREFIX="$HOME/.gem/ruby/1.8"
 export USER_PREFIX="$HOME/.local/armed"
 export USER_PKG="$HOME/.local/pkg"
 export USER_TOAST_PREFIX="$HOME/.toast/armed"
@@ -151,7 +153,8 @@
 
 export PYTHONSTARTUP="$HOME/.pythonrc.py"
 pythonpath_prepend=
-PYTHONVERSION=${PYTHONVERSION:-}
+: ${PYTHONVERSION:=}
+reset_var PYTHONVERSION
 if [[ ! "$PYTHONVERSION" ]] && type python >& /dev/null
 then PYTHONVERSION="$(python-version)"
 fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.