Commit cbe5fdf4 authored by Belhorn, Matt's avatar Belhorn, Matt
Browse files

Add patch to fix anaconda's broken ZSH support.

parent 0af0ef08

deploy_anaconda.sh

+15 −15
Original line number Diff line number Diff line
@@ -97,20 +97,6 @@ if [ ! -d "${ANACONDA_PATH}" ]; then 


# The anaconda 'activate' script makes some crummy assumptions about zsh

# version. This patch fixes it to work with all versions.

patch --unified --strip=1 --backup --directory="${ANACONDA_PATH}" <<'EOF'

--- a/bin/activate	2016-12-14 08:42:22.253429000 -0500

+++ b/bin/activate	2016-12-14 08:42:27.640355000 -0500

@@ -5,7 +5,7 @@

     _SCRIPT_LOCATION=${BASH_SOURCE[0]}

     _SHELL="bash"

 elif [[ -n $ZSH_VERSION ]]; then

-    _SCRIPT_LOCATION=${funcstack[1]}

+    _SCRIPT_LOCATION="${(%):-%N}"

     _SHELL="zsh"

 else

     echo "Only bash and zsh are supported"

EOF



fi
@@ -167,6 +153,20 @@ if [ ! -d "${ANACONDA_PATH}/envs/${VENV_NAME}" ]; then 
  echo "-> Creating Anaconda virtualenv, '${VENV_NAME}'"

  conda create -n "${VENV_NAME}" python=2.7 numpy accelerate



patch --unified --strip=1 --backup --directory="${ANACONDA_PATH}" <<'EOF'

--- a/bin/activate	2016-12-14 08:42:22.253429000 -0500

+++ b/bin/activate	2016-12-14 08:42:27.640355000 -0500

@@ -5,7 +5,7 @@

     _SCRIPT_LOCATION=${BASH_SOURCE[0]}

     _SHELL="bash"

 elif [[ -n $ZSH_VERSION ]]; then

-    _SCRIPT_LOCATION=${funcstack[1]}

+    _SCRIPT_LOCATION="${(%):-%N}"

     _SHELL="zsh"

 else

     echo "Only bash and zsh are supported"

EOF



  # Activate it

  echo "-> Activating VENV."

  source activate "${VENV_NAME}"
@@ -176,7 +176,7 @@ if [ ! -d "${ANACONDA_PATH}/envs/${VENV_NAME}" ]; then 
  echo "-> Building customized python packages"

  pip install --upgrade pip

  echo "-> Building mpi4py"

  CC=cc pip install -v --no-binary :all: mpi4py

  CC=cc MPICC=cc pip install -v --no-binary :all: mpi4py



  # H5py needs some configure options to use MPI. Worst case scenario, some

  # packages will need to be built without pip.