Commit 2525af28 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Check for conda in /usr/local too

parent ddbf0034

nsd-app-wrap.sh

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


CONDA_PREFIX_CENTRAL="/opt/anaconda"

CONDA_ACTIVATE_SCRIPT="${CONDA_PREFIX_CENTRAL}/bin/activate"

# several places have conda installed in /usr/local and link it over

CONDA_PREFIX_ALT="/usr/local/anaconda"



########## Connect to central conda command

_activate_conda_cmd() {
@@ -26,7 +28,7 @@ _activate_central_anaconda() { 
  fi



  # make sure that conda is found in the correct place

  if [[ "${CONDA_PREFIX}" != "${CONDA_PREFIX_CENTRAL}" ]]; then

  if [ "${CONDA_PREFIX}" != "${CONDA_PREFIX_CENTRAL}" ] && [ "${CONDA_PREFIX}" == "${CONDA_PREFIX_ALT}" ]; then

    echo "Found conda at \"${CONDA_PREFIX}\" rather than \"${CONDA_PREFIX_CENTRAL}\""

    exit 255

  fi