From 8b3b7efc8b98538efdebb56819b748d298d745c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20M=C3=A4der?= <maeder@phys.ethz.ch>
Date: Fri, 20 Sep 2024 14:06:11 +0200
Subject: [PATCH] Properly setup PATH in the right order
---
profile/default/envrcd.d/10-envvars | 10 +++++++++-
profile/rda/envrcd.d/10-envvars | 27 +++++++++++++++++----------
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/profile/default/envrcd.d/10-envvars b/profile/default/envrcd.d/10-envvars
index 1015651..40627e2 100644
--- a/profile/default/envrcd.d/10-envvars
+++ b/profile/default/envrcd.d/10-envvars
@@ -1,7 +1,15 @@
#!/bin/bash
# --- path ---
-export PATH="${HOME}/bin:${ENVRCD_PROFILE_PATH}/bin:${PATH}"
+if [ -d "${ENVRCD_PROFILE_PATH}/bin" ]; then
+ export PATH="${ENVRCD_PROFILE_PATH}/bin:${PATH}"
+fi
+if [ -d "${HOME}/.local/bin" ]; then
+ export PATH="${HOME}/.local/bin:${PATH}"
+fi
+if [ -d "${HOME}/bin" ]; then
+ export PATH="${HOME}/bin:${PATH}"
+fi
# --- locale ---
export LANGUAGE=en
diff --git a/profile/rda/envrcd.d/10-envvars b/profile/rda/envrcd.d/10-envvars
index 83fcf8d..af257b2 100644
--- a/profile/rda/envrcd.d/10-envvars
+++ b/profile/rda/envrcd.d/10-envvars
@@ -1,7 +1,23 @@
#!/bin/bash
# --- path ---
-export PATH="${HOME}/bin:${ENVRCD_PROFILE_PATH}/bin:${PATH}"
+if [ -d "${ENVRCD_PROFILE_PATH}/bin" ]; then
+ export PATH="${ENVRCD_PROFILE_PATH}/bin:${PATH}"
+fi
+if [ -d "${HOME}/.local/bin" ]; then
+ export PATH="${HOME}/.local/bin:${PATH}"
+fi
+if [ -d "${HOME}/bin" ]; then
+ export PATH="${HOME}/bin:${PATH}"
+fi
+if [[ "${ENVRCD_USER}" == "rda" ]] && [[ "${USER}" == "maedersv" || "${USER}" == "rda" ]]; then
+ if [ -d "${HOME}/env/pyenv/bin" ]; then
+ export PATH="${HOME}/env/pyenv/bin:${PATH}"
+ fi
+ if [ -d "${HOME}/.cargo/bin" ]; then
+ export PATH="${HOME}/.cargo/bin:${PATH}"
+ fi
+fi
# --- git ---
if [ "${ENVRCD_USER}" == "rda" ]; then
@@ -97,15 +113,6 @@ export BAT_THEME='DarkNeon'
# --- ansible ---
if [[ "${ENVRCD_USER}" == "rda" ]] && [[ "${USER}" == "maedersv" || "${USER}" == "rda" ]]; then
#export ANSIBLE_CONFIG="${HOME}/.ansible.cfg"
- if [ -d "${HOME}/.cargo/env" ]; then
- export PATH="${HOME}/.cargo/env:${PATH}"
- fi
- if [ -d "${HOME}/.local/bin" ]; then
- export PATH="${HOME}/.local/bin:${PATH}"
- fi
- if [ -d "${HOME}/env/pyenv/bin" ]; then
- export PATH="${HOME}/env/pyenv/bin:${PATH}"
- fi
export ANSIBLE_STRATEGY_PLUGINS="${HOME}/.ansible/mitogen/ansible_mitogen/plugins/strategy"
export ANSIBLE_STRATEGY="mitogen_linear"
export ANSIBLE_ISG_PHYS_PATH="${HOME}/git/ansible-isg-phys"
--
GitLab