Move conda.txt and source.txt into their directory to allow users to have custom blacklist

pyenv.d/rehash/conda.bash

@@ -12,11 +12,13 @@ conda_exists() {
 }
 
 shims=()
-for shim in $(cat "${BASH_SOURCE%/*}/conda.txt"); do
+shopt -s nullglob
-  if [ -n "${shim%%#*}" ]; then
+for shim in $(cat "${BASH_SOURCE%/*}/conda.d/"*".list" | sort | uniq | sed -e 's/#.*$//' | sed -e '/^[[:space:]]*$/d'); do
+  if [ -n "${shim##*/}" ]; then
     shims[${#shims[*]}]="${shim})return 0;;"
   fi
 done
+shopt -u nullglob
 eval "conda_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}"
 
 # override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`

pyenv.d/rehash/conda.d/.gitignore

@@ -0,0 +1,3 @@
+*
+!/.gitignore
+!/default.list

pyenv.d/rehash/source.bash

@@ -1,11 +1,13 @@
 PROTOTYPE_SOURCE_SHIM_PATH="${SHIM_PATH}/.pyenv-source-shim"
 
 shims=()
-for shim in $(cat "${BASH_SOURCE%/*}/source.txt"); do
+shopt -s nullglob
-  if [ -n "${shim%%#*}" ]; then
+for shim in $(cat "${BASH_SOURCE%/*}/source.d/"*".list" | sort | uniq | sed -e 's/#.*$//' | sed -e '/^[[:space:]]*$/d'); do
+  if [ -n "${shim##*/}" ]; then
     shims[${#shims[*]}]="${shim})return 0;;"
   fi
 done
+shopt -u nullglob
 eval "source_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}"
 
 cat > "${PROTOTYPE_SOURCE_SHIM_PATH}" <<SH

pyenv.d/rehash/source.d/.gitignore

@@ -0,0 +1,3 @@
+*
+!/.gitignore
+!/default.list

pyenv.d/rehash/source.d/default.list

@@ -0,0 +1,6 @@
+# virtualenv
+activate
+activate.csh
+activate.fish
+# gettext (#688)
+gettext.sh

pyenv.d/rehash/source.txt

@@ -1 +0,0 @@
-gettext.sh