lib/sandbox/templates/activate.erb in ruby-virtualenv-0.5.0 vs lib/sandbox/templates/activate.erb in ruby-virtualenv-0.5.1

- old
+ new

@@ -31,22 +31,16 @@ if [ -n "$_OLD_SANDBOX_PATH" ] ; then PATH="$_OLD_SANDBOX_PATH" export PATH fi - if [ -n "$_OLD_SANDBOX_HOME" ] ; then - HOME="$_OLD_SANDBOX_HOME" - export HOME - fi - if [ -n "$_OLD_SANDBOX_PS1" ] ; then PS1="$_OLD_SANDBOX_PS1" export PS1 fi unset _OLD_SANDBOX_PATH - unset _OLD_SANDBOX_HOME unset _OLD_SANDBOX_GEM_HOME unset _OLD_SANDBOX_GEM_PATH unset _OLD_SANDBOX_PS1 unset SANDBOX_ENV @@ -66,27 +60,19 @@ # preserve current variables _OLD_SANDBOX_GEM_HOME="$GEM_HOME" _OLD_SANDBOX_GEM_PATH="$GEM_PATH" _OLD_SANDBOX_PATH="$PATH" - _OLD_SANDBOX_HOME="$HOME" _OLD_SANDBOX_PS1="$PS1" # set the sandbox-aware states SANDBOX_ENV="<%= target %>" PATH="$SANDBOX_ENV/bin:$PATH" - HOME="$SANDBOX_ENV" GEM_HOME="$SANDBOX_ENV/rubygems" GEM_PATH="$GEM_HOME" - if [ "`basename \"$SANDBOX_ENV\"`" = "__" ] ; then - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - PS1="[ruby-virtualenv:`basename \`dirname \"$SANDBOX_ENV\"\``] $PS1" - else - PS1="(ruby-virtualenv:`basename \"$SANDBOX_ENV\"`) $PS1" - fi + PS1="(`basename \"$SANDBOX_ENV\"`) $PS1" - export SANDBOX_ENV PATH HOME GEM_HOME GEM_PATH PS1 + export SANDBOX_ENV PATH GEM_HOME GEM_PATH PS1 forget_cached_commands unset activate }