Merge pull request #1225 from halfhorst/feature/conda-zork

zork theme: add support for conda
pull/1201/head
Nils Winkler 2018-08-15 10:12:29 +02:00 committed by GitHub
commit e3c99f4d57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions

View File

@ -57,7 +57,12 @@ chroot(){
# show virtualenvwrapper # show virtualenvwrapper
my_ve(){ my_ve(){
if [ -n "$VIRTUAL_ENV" ]
if [ -n "$CONDA_DEFAULT_ENV" ]
then
my_ps_ve="${bold_purple}${CONDA_DEFAULT_ENV}${normal}";
echo "($my_ps_ve)";
elif [ -n "$VIRTUAL_ENV" ]
then then
my_ps_ve="${bold_purple}$ve${normal}"; my_ps_ve="${bold_purple}$ve${normal}";
echo "($my_ps_ve)"; echo "($my_ps_ve)";