From 827aa3d74367201cd4b24fb72015357eaa3e1878 Mon Sep 17 00:00:00 2001
From: Juntong Liu <juntong.liu@ess.eu>
Date: Mon, 28 Jun 2021 08:40:46 +0000
Subject: [PATCH] Keep user's shell prompt string if it exists
---
require-ess/tools/setE3Env.bash | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash
index d8a6dbfa..215d1d0a 100644
--- a/require-ess/tools/setE3Env.bash
+++ b/require-ess/tools/setE3Env.bash
@@ -354,5 +354,18 @@ echo "##############################################"
echo
BASE_version=$(echo "${EPICS_BASE##*/}" | awk -F '-' '{print $2}')
+E3_ENV_INFO="{B:$BASE_version R:$E3_REQUIRE_VERSION}"
+NEW_E3_PS="${E3_ENV_INFO}\[\033[33m\]\u\[\033[m\]@\[\033[33;1m\]\w\[\033[m\]\$ "
-export PS1="\[\033[33m\]\u\[\033[m\] @ Base:$BASE_version Req:$E3_REQUIRE_VERSION \[\033[33;1m\] \w\[\033[m\]\$ "
+if [ -z "$E3_ENV_ON" ]; then
+ if [ -z "$PS1" ]; then
+ export E3_ENV_ON="ON"
+ export PS1="${NEW_E3_PS}"
+ else
+ export E3_ENV_ON="ON"
+ export PS1="${E3_ENV_INFO}${PS1}"
+ fi
+else
+ PS_TMP=${PS1/\{*\}/}
+ export PS1="${E3_ENV_INFO}${PS_TMP}"
+fi
--
GitLab