From f449a3e5ab8ddcae64cf7512dd08385db7e70b3b Mon Sep 17 00:00:00 2001 From: Juntong Liu <juntong.liu@ess.eu> Date: Mon, 28 Jun 2021 08:44:59 +0000 Subject: [PATCH] keep the user shell prompt string if it exists. Make shfmt happy --- require-ess/tools/setE3Env.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash index 215d1d0a..21dbe5f2 100644 --- a/require-ess/tools/setE3Env.bash +++ b/require-ess/tools/setE3Env.bash @@ -357,14 +357,14 @@ 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\]\$ " -if [ -z "$E3_ENV_ON" ]; then +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 E3_ENV_ON="ON" export PS1="${E3_ENV_INFO}${PS1}" - fi + fi else PS_TMP=${PS1/\{*\}/} export PS1="${E3_ENV_INFO}${PS_TMP}" -- GitLab