Skip to content

Commit

Permalink
Always perform conda command check
Browse files Browse the repository at this point in the history
  • Loading branch information
brianv0 committed Jun 9, 2020
1 parent 32f6c6c commit 8278f89
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions scripts/newinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,6 @@ n8l::miniconda::bootstrap() {
local splenv_ref=$6
local conda_channels=$7

local performed_install=false

# Clear arguments for source
while (( "$#" )); do
shift
Expand All @@ -644,17 +642,14 @@ n8l::miniconda::bootstrap() {
"$miniconda_base_url"
# only miniconda current symlink if we installed miniconda
n8l::ln_rel "$miniconda_path" current
performed_install=true
fi
fi

if [[ $performed_install == false ]]; then
(
export PATH="${miniconda_path}/bin:${PATH}"
n8l::require_cmds conda
)
echo "Using conda at ${miniconda_path}"
fi
(
export PATH="${miniconda_path}/bin:${PATH}"
n8l::require_cmds conda
)
echo "Using conda at ${miniconda_path}"

# Activate the base conda environment before continuing
# shellcheck disable=SC1090
Expand Down

0 comments on commit 8278f89

Please sign in to comment.