Skip to content

Prevent syntax error when PROMPT_COMMAND not empty #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cstogmuller wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Prevent syntax error when PROMPT_COMMAND not empty #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e95153c
Prevent syntax errors
cstogmuller May 9, 2024
ec86d4f
Prevent syntax error when PROMPT_COMMAND not empty
cstogmuller May 20, 2024
25dda91
Merge remote-tracking branch 'upstream/master'
cstogmuller Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bash_sessions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ fi
# switch to working directory
if [ -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/pwd" ]; then
cd "$(cat "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/pwd")"
export PROMPT_COMMAND="${PROMPT_COMMAND:+;}__bs_savepwd"
export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND; }__bs_savepwd"
fi

# load environment
Expand All @@ -159,7 +159,7 @@ if [[ -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/env_changed" || -f "${BASH_S
while read line; do
unset $line;
done < "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/env_deleted"
export PROMPT_COMMAND="${PROMPT_COMMAND};__bs_saveenv"
export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND; }__bs_saveenv"
fi

' > "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/bashrc"
Expand Down Expand Up @@ -375,12 +375,12 @@ S (){
elif [ "${1}" == "pwd" ]; then
if [ "${2}" == "on" ]; then
if ! [ -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/pwd" ]; then
export PROMPT_COMMAND="${PROMPT_COMMAND};__bs_savepwd"
export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND; }__bs_savepwd"
fi
elif [ "${2}" == "off" ]; then
if [ -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/pwd" ]; then
rm "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/pwd"
export PROMPT_COMMAND="${PROMPT_COMMAND/;__bs_savepwd/}"
export PROMPT_COMMAND="${PROMPT_COMMAND/; __bs_savepwd/}"
fi
else
echo "bash_sessions: invalid argument \"${2}\""
Expand All @@ -389,7 +389,7 @@ S (){
elif [ "${1}" == "env" ]; then
if [ "${2}" == "on" ]; then
if ! [[ -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/env_changed" && -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/env_deleted" ]]; then
export PROMPT_COMMAND="${PROMPT_COMMAND};__bs_saveenv"
export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND; }__bs_saveenv"
fi
elif [ "${2}" == "off" ]; then
if [ -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/env_changed" ]; then
Expand All @@ -398,7 +398,7 @@ S (){
if [ -f "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/env_deleted" ]; then
rm "${BASH_SESSIONS_DIR}/${BASH_SESSION_NAME}/env_deleted"
fi
export PROMPT_COMMAND="${PROMPT_COMMAND/;__bs_saveenv/}"
export PROMPT_COMMAND="${PROMPT_COMMAND/; __bs_saveenv/}"
else
echo "bash_sessions: invalid argument \"${2}\""
fi
Expand Down