Merge pull request #3151 from ChristianFredrikJohnsen/fix/conda-rehash

Do not execute conda-specific code if conda is not installed

pyenv.d/rehash/conda.bash

@@ -11,18 +11,32 @@ conda_exists() {
   [ -n "${condas}" ]
 }
 
+if conda_exists; then
+
+  # Reads the list of `blacklisted` conda binaries
+  # from `conda.d/default.list` and creates a function
+  # `conda_shim` to skip creating shims for those binaries.
+  build_conda_exclusion_list() {
     shims=()
-shopt -s nullglob
+    for shim in $(sed 's/#.*$//; /^[[:space:]]*$/d' "${BASH_SOURCE%/*}/conda.d/default.list"); do
-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 \
-eval "conda_shim(){ case \"\${1##*/}\" in ${shims[@]} *)return 1;;esac;}"
+"conda_shim() {
+  case \"\${1##*/}\" in
+    ${shims[@]}
+    *) return 1;;
+  esac
+}"
+  }
 
   # override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`
   # https://github.com/pyenv/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash
+  # The only difference between this `make_shims` and the `make_shims` defined
+  # in `libexec/pyenv-rehash` is that this one calls `conda_shim` to check
+  # if shim is blacklisted. If blacklisted -> skip creating shim.
   make_shims() {
     local file shim
     for file do
@@ -53,6 +67,6 @@ deregister_conda_shims() {
     fi
   }
 
-if conda_exists; then
+  build_conda_exclusion_list
   deregister_conda_shims
 fi

pyenv.d/rehash/conda.d/default.list

@@ -117,6 +117,7 @@ factor
 false
 fmt
 fold
+greadlink
 groups
 head
 hostid
@@ -192,4 +193,3 @@ who
 whoami
 yes
 # --- end exclusions from coreutils
-greadlink