Skip to content
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

fix deactivate with existing PROMPT_COMMAND #949

Merged
merged 1 commit into from
Oct 20, 2023
Merged

fix deactivate with existing PROMPT_COMMAND #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/shell/bash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ impl Shell for Bash {

fn deactivate(&self) -> String {
formatdoc! {r#"
PROMPT_COMMAND="${{PROMPT_COMMAND//_rtx_hook;/}}"
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this maybe isn't the cleanest but I couldn't figure out a simpler way off the top of my head

PROMPT_COMMAND="${{PROMPT_COMMAND//_rtx_hook/}}"
unset _rtx_hook
unset rtx
Expand Down
1 change: 1 addition & 0 deletions src/shell/snapshots/rtx__shell__bash__tests__deactivate.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
source: src/shell/bash.rs
expression: replace_path(&deactivate)
---
PROMPT_COMMAND="${PROMPT_COMMAND//_rtx_hook;/}"
PROMPT_COMMAND="${PROMPT_COMMAND//_rtx_hook/}"
unset _rtx_hook
unset rtx
Expand Down