Commit d9232545 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Improve pattern matching in pydevenv* setup funcs

parent aefd8ba3

.shell/lib/virtualenv.bash

+9 −6
Original line number Diff line number Diff line
@@ -12,11 +12,10 @@ _venv_glob_path() { 
		for pattern in "$@"; do

			(

				case $CURRENT_SHELL in

					bash) shopt -u failglob; shopt -s nullglob ;;

					zsh) setopt CSH_NULL_GLOB ;;

					bash) shopt -u failglob; shopt -s nullglob extglob ;;

					zsh) setopt nullglob extendedglob badpattern ;;

				esac

				set +e

				eval 2>/dev/null "printf '%s\n' "$dir"/$pattern"

				eval "printf '%s\n' '$dir'/$pattern"

			)

		done

	done
@@ -24,9 +23,13 @@ _venv_glob_path() { 




_venv_make_func() {

	local python version

	local pattern python version

	local platform=`uname -s | tr A-Z a-z`

	for python in $(_venv_glob_path 'python3.*'|basename_filter|sort -u); do

	case $CURRENT_SHELL in

		zsh) pattern='python[0-9]^*-*' ;;

		*) pattern='python[0-9]!(*-*)' ;;

	esac

	for python in $(_venv_glob_path "$pattern"|basename_filter|sort -u); do

		version=$(tr -d . <<<"${python#python}")

		alias pydevenv${version}="_venv_enable $version $platform $python"

	done