File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change 149
149
echo " = Conda setup ="
150
150
151
151
condaDir=$HOME /miniconda
152
- if [ ! -f " $condaDir /bin/conda" ]; then
152
+ condaSh=$condaDir /etc/profile.d/conda.sh
153
+ if [ ! -f " $condaSh " ]; then
153
154
echo
154
155
echo " == Installing conda =="
155
156
if [ " $TRAVIS_PYTHON_VERSION " = " 2.7" ]; then
@@ -164,17 +165,18 @@ then
164
165
165
166
echo
166
167
echo " == Updating conda =="
167
- $condaDir /bin/conda config --set always_yes yes --set changeps1 no &&
168
- $condaDir /bin/conda update -q conda &&
169
- $condaDir /bin/conda info -a
168
+ . " $condaSh " &&
169
+ conda config --set always_yes yes --set changeps1 no &&
170
+ conda update -q conda &&
171
+ conda info -a
170
172
checkSuccess $?
171
173
172
174
echo
173
175
echo " == Configuring environment =="
174
176
condaEnv=travis-scijava
175
177
test -d " $condaDir /envs/$condaEnv " && condaAction=update || condaAction=create
176
- $condaDir /bin/ conda env " $condaAction " -n " $condaEnv " -f environment.yml &&
177
- $condaDir /bin/ conda activate " $condaEnv "
178
+ conda env " $condaAction " -n " $condaEnv " -f environment.yml &&
179
+ conda activate " $condaEnv "
178
180
checkSuccess $?
179
181
180
182
echo travis_fold:end:scijava-conda
You can’t perform that action at this time.
0 commit comments