Skip to content

Commit

Permalink
Fix a few minor issues with the "Bootstrap" contribut method (biocond…
Browse files Browse the repository at this point in the history
…a#10668)

* Hide 'bioconda-utils not found' output

If bioconda-utils is not found, we get:
'.circleci/setup.sh: line 34: type: bioconda-utils: not found'

This is confusing since it is not an error: we _are_ actually checking
for bioconda-utils to see if we need to install it!

* Give the path to .circleci/setup.sh when bootstrapping.

On OSX, utilities like md5 are found in /sbin, which was not on the path
when running the .circleci/setup.sh, which in turn ran the miniconda
setup, which in turn ran md5.
  • Loading branch information
nh13 authored and daler committed Sep 23, 2018
1 parent d8f05da commit 6a599fc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .circleci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fi
git remote remove $UPSTREAM_REMOTE


if ! type bioconda-utils > /dev/null || [[ $BOOTSTRAP == "true" ]]; then
if ! type bioconda-utils 2> /dev/null || [[ $BOOTSTRAP == "true" ]]; then
echo "Setting up bioconda-utils..."

# setup conda and bioconda-utils if not loaded from cache
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def _write_custom_activate(install_path):
if args.no_docker:
use_docker = "false"

env = {'WORKSPACE': args.bootstrap, 'BOOTSTRAP': "true", 'USE_DOCKER': use_docker}
env = {'WORKSPACE': args.bootstrap, 'BOOTSTRAP': "true", 'USE_DOCKER': use_docker, 'PATH': os.environ['PATH']}
sp.check_call(['.circleci/setup.sh'], env=env)
_write_custom_activate(args.bootstrap)

Expand Down

0 comments on commit 6a599fc

Please sign in to comment.