Doug Hellmann avatar Doug Hellmann committed 8e73805

fix for issue #5

Comments (0)

Files changed (4)

 Updates
 =======
 
+1.13
+  - Fix issue #5 by correctly handling symlinks and limiting the list of envs to things 
+    that look like they can be activated.
+
 1.12
   - Check return value of virtualenvwrapper_verify_workon_home everywhere, thanks to 
     Jeff Forcier for pointing out the errors.
 
 # What project are we building?
 PROJECT = 'virtualenvwrapper'
-VERSION = '1.12'
+VERSION = '1.13'
 
 # Read the long description to give to setup
 README_FILE = 'README'
 
 echo
 echo "LISTING ENVIRONMENTS"
+mkdir -p "$WORKON_HOME/extra/bin"
+touch "$WORKON_HOME/extra/bin/activate"
+(cd "$WORKON_HOME"; ln -s extra link)
 envs=`workon | tr '\n' ' '`
 echo "Found environments: $envs"
-if [ "$envs" = "env1 env2 " ]
+if [ "$envs" = "env1 env2 extra link " ]
 then
     echo "PASS"
 else
     echo "FAIL: \""$envs\"""
+    ls -l "$WORKON_HOME"
 fi
 
 echo

virtualenvwrapper_bashrc

 # List the available environments.
 function virtualenvwrapper_show_workon_options () {
     virtualenvwrapper_verify_workon_home || return 1
-	find "$WORKON_HOME" -maxdepth 1 -mindepth 1 -type d -exec basename '{}' \; | sort
+    (cd "$WORKON_HOME"; ls */bin/activate) | sed 's|/bin/activate||' | sort
 }
 
 # List or change working virtual environments
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.