Skip to content

Commit

Permalink
scripts: Set CONDA_PREFIX in enter-env.sh and download-env.sh
Browse files Browse the repository at this point in the history
This is required for Renode package to run properly. This variable is
set automatically when activating an environment, but not if we work
with the base one, without activation.

Setting it in download-env will ensure the proper path when running it
from an activated environment. Please note this is not a default
usage scenario.
  • Loading branch information
PiotrZierhoffer committed Nov 8, 2019
1 parent 93880bb commit b8d29a8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions scripts/download-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ set -e

. $SETUP_DIR/settings.sh

# If we activate an environment, CONDA_PREFIX is set. Otherwise use CONDA_DIR.
export CONDA_PREFIX="${CONDA_PREFIX:-$CONDA_DIR}"
export CONDA_DIR=$CONDA_PREFIX

echo " This script is: $SETUP_SRC"
echo " Firmware directory: $TOP_DIR"
echo " Build directory is: $BUILD_DIR"
Expand Down
4 changes: 4 additions & 0 deletions scripts/enter-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ fi

. $SETUP_DIR/settings.sh

# If we activate an environment, CONDA_PREFIX is set. Otherwise use CONDA_DIR.
export CONDA_PREFIX="${CONDA_PREFIX:-$CONDA_DIR}"
export CONDA_DIR=$CONDA_PREFIX

echo " This script is: $SETUP_SRC"
echo " Firmware directory: $TOP_DIR"
echo " Build directory is: $BUILD_DIR"
Expand Down

0 comments on commit b8d29a8

Please sign in to comment.