diff options
author | Florian Dold <florian@dold.me> | 2021-04-14 13:14:34 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2021-04-14 13:14:34 +0200 |
commit | ef5b0e88204e2c78c512dbbd59bbb087d9c8573b (patch) | |
tree | 76e61ad6f209019b6071cd83fb6c2c3867ab7e3e /bin/taler-deployment | |
parent | 38f4e5eb5ad2e433758b9a7a758413112240bbc3 (diff) | |
download | deployment-ef5b0e88204e2c78c512dbbd59bbb087d9c8573b.tar.gz deployment-ef5b0e88204e2c78c512dbbd59bbb087d9c8573b.tar.bz2 deployment-ef5b0e88204e2c78c512dbbd59bbb087d9c8573b.zip |
fix ever-growing PATH
Diffstat (limited to 'bin/taler-deployment')
-rwxr-xr-x | bin/taler-deployment | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/bin/taler-deployment b/bin/taler-deployment index 15f5f9d..ce69c57 100755 --- a/bin/taler-deployment +++ b/bin/taler-deployment @@ -35,7 +35,8 @@ activate_template = """\ if ! echo $PATH | tr ":" '\\n' | grep "$HOME/deployment/bin" > /dev/null then - export PATH="$HOME/deployment/bin:$HOME/local/bin:{curr_path}" + #export PATH="$HOME/deployment/bin:$HOME/local/bin:{curr_path}" + export PATH="{curr_path}" fi export PYTHONUSERBASE=$HOME/local export TALER_BOOTSTRAP_TIMESTAMP={timestamp} @@ -547,13 +548,22 @@ def bootstrap() -> None: envname = env_info.name checkout_repos(cfg,repos) + # Generate $PATH variable that will be set in the activate script. + local_path = str(Path.home() / "local" / "bin") + deployment_path = str(Path.home() / "deployment" / "bin") + path_list = os.environ["PATH"].split(":") + if local_path not in path_list: + path_list.insert(0, local_path) + if deployment_path not in path_list: + path_list.insert(0, deployment_path) + with (home / "activate").open("w") as f: f.write( activate_template.format( envname=envname, timestamp=str(time.time()), currency=currmap[envname], - curr_path=os.environ["PATH"], + curr_path=":".join(path_list), coverage=1 if envname == "coverage" else 0, **get_urls(envname) ) |