[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: fix ever-growing PATH
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: fix ever-growing PATH |
Date: |
Wed, 14 Apr 2021 13:14:39 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new ef5b0e8 fix ever-growing PATH
ef5b0e8 is described below
commit ef5b0e88204e2c78c512dbbd59bbb087d9c8573b
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Apr 14 13:14:34 2021 +0200
fix ever-growing PATH
---
bin/taler-deployment | 14 ++++++++++++--
1 file 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)
)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: fix ever-growing PATH,
gnunet <=