diff options
| author | Matthew Iversen <teh.ivo@gmail.com> | 2015-09-20 20:54:17 +1000 |
|---|---|---|
| committer | Matthew Iversen <teh.ivo@gmail.com> | 2015-09-20 20:54:17 +1000 |
| commit | 06b12ca53d9c6992f46b262ba848189c006b27cc (patch) | |
| tree | 08bd376de1155b5491cbb98299a4f9bab8c7a2d0 | |
| parent | 4800b9e27fa812499b485837111200b4aa711571 (diff) | |
| download | virtualenv-06b12ca53d9c6992f46b262ba848189c006b27cc.tar.gz | |
Remove legacy aspen workaround
| -rwxr-xr-x | virtualenv.py | 27 | ||||
| -rw-r--r-- | virtualenv_embedded/activate.sh | 6 |
2 files changed, 13 insertions, 20 deletions
diff --git a/virtualenv.py b/virtualenv.py index 93544ef..93f56d0 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -2033,20 +2033,19 @@ AVijEPwfucjncQ== ##file activate.sh ACTIVATE_SH = convert(""" -eJytVd9v2kAMfs9fYQIPbTcascdOTKMqEkgtVA3rtLVVOBKHnBTuUHLhR6v+7/OFAwIBJm3lAcjZ -Z3/258+pwiDiKYQ8RphkqYIRQpZiAHOuIrBTmSU+wogLh/mKz5hCGy7CRE5gxNLowqrCUmbgMyGk -giQTwBUEPEFfxUvLCnB9C87O4c0C+mQiRQX1EKbLQPpWflaFBPWpjANAMeOJFBMUCmYs4WwUY5p7 -8RAq8AT1V7Brb17/9sZ77D4MfrRuvfvWoPPJe7fhBb6CilDk/vqjLU27VvK2Nx64mMpE5Y6bsxXG -0qXcHvK/gfk16PR7nf5d+wikjb0EbGMpw9uYToLc9SKopr05yWkkM2pwgIroyfkDJgJ4TaPPMI+4 -H0HEZgiMfsjky8lEm1XEVD4aJhQNiM/imEZESRgTAmKc/oUy0Q9TRjNkrqaXAD9pjGSmjFlxMTZh -dhx1g6CmWwx+xMQYU5jTPLJAfy1BzxalpRmZEnIM1gRQ+4Vu/3XL7dSp1XVpDn67He+x/eB2+736 -IQryAusJfPnmBDhzRBbHOw07Qa7bOMKq2yjR6TbKPLqNkwQa8xrIymVtbfcet6VXNLaGLq8JtpAi -wFQlmZYb7sGrgotxCGuHyh6AujatdbrO/m6RtFd2niQY44zt6LGg7N3cllVA27Q9r/DoebZl+lAs -ySoJjTq5Eql5KHg7nnfd7Xm91l3b866MW1HDG9xbMeiG0Ym1Q2tBpot9Qo+ISsPak+h+KksztxrN -PEux+puu27q+bXv3D/27+0FpMPcHQWdbT1Ae0V5su7mKQQ2FShMWR8ax7L6NiHGKhdBDWgco2ATh -eafdz/YwHzCdqZSkClqQnMW0EVLUGocWnQgS7Zj75j0gE272t7mCCJFS0yvHmc/nl6+oSOazS1oF -TipDNWcJOkxHcXaLeSpAHFLog2Cfh8MXOFDkJsrZiULPtxfNkjc/Be1qesNM0KhLsXqDmdcaLtCn -A9p2AuoTY7Jr3+2VlD5kAX/A8v3PxfuvS/fQwqVW/gFsN316 +eJytVNtu2kAQffdXDIaHJK2L6GMrqhIFCaQEopimaptqs9jjeCWzi+w1l0T59876AjYOqdTGD2Dv +zO6cPefMtGEWigQCESEs0kTDHCFN0Ie10CHYiUpjD2EuZJd7Wqy4RhvOglgtYM6T8Mxqw1al4HEp +lYY4lSA0+CJGT0dby/Kx3AUnp/BkAT2pTFCDE8By6yvPytbaEKNZVZEPKFciVnKBUsOKx4LPI0yy +LBFAC36B8wh254lNLy/Y7fhm9m1wya4Hs9E79mzDb/gMOkSZ5ZvHRPp2p5Ft7zJws1SxzhJ3aznG +xqYsHoi/gfkxG00no+nV8AikXbwBbBdpwtuFXgVZzyKoBb2ZyEmoUiLYR03yZPoBlz48JuF7WIfC +CyHkKwROfxTy1GJhwjrkOrNGcRQZxONRRBbRCh4IASlOb4GKzceSk4eKrckHgO9kI5XqIqyFfCiO +qSUagqBjKAYv5PIBE1iTH7lvfrZgvEVlySNLQo5+KQDRLw395wN35BDVjioWfrojdju8ccfTifOS +BNkFnRg+fun6uOrKNIpqhL0irts7oqrba8jp9po6ur1XBSzCJZA8pYwOJ7f7q7cMtp65Xh9sqaSP +iY5T0254AK8NLkYBlAmtAwCOCZV9WlZ/tqi187iIY4xwxWv9WOnsem3LqqDt24xVPhmzrYKH6pWs +RqMRk3mTFh+V7C5j5+MJmwyuhox9KtKqPbzDvW8GQxitWDVZK226ORT0SFMZWActeljKMsrl1syq +VG9/MXYH55dDdn0zvbqeNYx5aARTrXRQdqK92bOZn0GEQqsPmyN2bKbvT8QowXr2yT2NBJR8gXBX +o/zOvj/dbyzmX8XP5spBKkl+JfOpXox63KBHCzQBJDiLImR3vtq5vd5kKL3BQPrPYfSvg+ilIURU +/gF8xjhJ """) ##file activate.fish diff --git a/virtualenv_embedded/activate.sh b/virtualenv_embedded/activate.sh index 285dee2..aaabc1e 100644 --- a/virtualenv_embedded/activate.sh +++ b/virtualenv_embedded/activate.sh @@ -57,14 +57,8 @@ if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" ] ; then if [ "x__VIRTUAL_PROMPT__" != x ] ; then PS1="__VIRTUAL_PROMPT__$PS1" else - if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1" - else PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1" fi - fi export PS1 fi |