Fix couple of env variable usage issues in venv scripts
There are couple of issues in scripts which are responsible for creating virtual environment. Issues are listed in bug#1472509. This patch fix those issues. Change-Id: I1902377c078342484cf01428660bb1b36eac1552 Closes-Bug: 1472509
This commit is contained in:
parent
77324b4150
commit
905420cf2e
|
@ -48,8 +48,8 @@ def print_help(venv, root):
|
|||
def main(argv):
|
||||
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||
|
||||
if os.environ.get('tools_path'):
|
||||
root = os.environ['tools_path']
|
||||
if os.environ.get('TOOLS_PATH'):
|
||||
root = os.environ['TOOLS_PATH']
|
||||
venv = os.path.join(root, '.venv')
|
||||
if os.environ.get('VENV'):
|
||||
venv = os.environ['VENV']
|
||||
|
|
|
@ -72,7 +72,7 @@ function process_options {
|
|||
|
||||
TOOLS_PATH=${TOOLS_PATH:-${PWD}}
|
||||
VENV_PATH=${VENV_PATH:-${PWD}}
|
||||
VENV_DIR=${VENV_NAME:-.venv}
|
||||
VENV_DIR=${VENV_DIR:-.venv}
|
||||
WITH_VENV=${TOOLS_PATH}/tools/with_venv.sh
|
||||
|
||||
ALWAYS_VENV=0
|
||||
|
@ -99,7 +99,6 @@ process_options $@
|
|||
export VENV_PATH
|
||||
export TOOLS_PATH
|
||||
export VENV_DIR
|
||||
export VENV_NAME
|
||||
export WITH_VENV
|
||||
export VENV=${VENV_PATH}/${VENV_DIR}
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/bash
|
||||
TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)}
|
||||
TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)/../}
|
||||
VENV_PATH=${VENV_PATH:-${TOOLS_PATH}}
|
||||
VENV_DIR=${VENV_NAME:-/../.venv}
|
||||
TOOLS=${TOOLS_PATH}
|
||||
VENV_DIR=${VENV_DIR:-/.venv}
|
||||
VENV=${VENV:-${VENV_PATH}/${VENV_DIR}}
|
||||
source ${VENV}/bin/activate && "$@"
|
||||
|
|
Loading…
Reference in New Issue