Skip to content

Commit

Permalink
Remove conda activattion from configure-aiida.sh script. (#3791)
Browse files Browse the repository at this point in the history
Now handled globally by the base container.
  • Loading branch information
yakutovicha authored Feb 23, 2020
1 parent a2bebb4 commit 12ed1f0
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions .docker/opt/configure-aiida.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,7 @@ set -x
# Environment.
export SHELL=/bin/bash

# Activate conda.
__conda_setup="$('/opt/conda/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/opt/conda/etc/profile.d/conda.sh" ]; then
. "/opt/conda/etc/profile.d/conda.sh"
else
export PATH="/opt/conda/bin:$PATH"
fi
fi
unset __conda_setup

# Very important to run after conda activation, otherwise AiiDA won't work.
# Update the list of installed aiida plugins.
reentry scan

# Setup AiiDA autocompletion.
Expand Down

0 comments on commit 12ed1f0

Please sign in to comment.