Skip to content

Improving shell display support #19

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

Merged
madhavajay merged 1 commit into from
Sep 16, 2025
Merged

Improving shell display support #19

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
159 changes: 0 additions & 159 deletions cli/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 19 additions & 9 deletions cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,16 @@ fn activate_environment(quiet: bool) -> Result<()> {
println!(" export PS1=\"📦 ($SYFTBOX_ENV_NAME) $PS1\"");
println!(" fi");
println!("else");
println!(" # Bash");
println!(" export SYFTBOX_OLD_PS1=\"$PS1\"");
println!(" export PS1=\"📦 ($SYFTBOX_ENV_NAME) $PS1\"");
println!(" # Bash - detect if using PROMPT_COMMAND (modern prompt frameworks)");
println!(" if [ -n \"$PROMPT_COMMAND\" ]; then");
println!(" # Using a prompt framework like Starship, Oh My Bash, etc.");
println!(" export SYFTBOX_OLD_PROMPT_COMMAND=\"$PROMPT_COMMAND\"");
println!(" export PROMPT_COMMAND='echo -ne \"\\033[0m📦 (${{SYFTBOX_ENV_NAME}}) \"; '\"$PROMPT_COMMAND\"");
println!(" else");
println!(" # Traditional bash prompt");
println!(" export SYFTBOX_OLD_PS1=\"$PS1\"");
println!(" export PS1=\"\\[\\033[0m\\]📦 (${{SYFTBOX_ENV_NAME}}) ${{PS1}}\"");
println!(" fi");
println!("fi");

println!(
Expand Down Expand Up @@ -542,8 +549,12 @@ fn deactivate_environment(quiet: bool) -> Result<()> {
println!(" unset POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV");
println!("fi");

// Restore PS1 for non-Powerlevel10k shells
println!("if [ -n \"$SYFTBOX_OLD_PS1\" ]; then");
// Restore PS1 or PROMPT_COMMAND for non-Powerlevel10k shells
println!("# Restore bash prompt");
println!("if [ -n \"$SYFTBOX_OLD_PROMPT_COMMAND\" ]; then");
println!(" export PROMPT_COMMAND=\"$SYFTBOX_OLD_PROMPT_COMMAND\"");
println!(" unset SYFTBOX_OLD_PROMPT_COMMAND");
println!("elif [ -n \"$SYFTBOX_OLD_PS1\" ]; then");
println!(" export PS1=\"$SYFTBOX_OLD_PS1\"");
println!(" unset SYFTBOX_OLD_PS1");
println!("fi");
Expand Down Expand Up @@ -702,9 +713,8 @@ fn get_shell_functions() -> String {
" # Fix Powerlevel10k prompt to show 📦 and email instead of 'Py'
",
);
functions.push_str(
" if [[ -n \"$ZSH_VERSION\" ]] && [[ -n \"$SYFTBOX_EMAIL\" ]]; then\n",
);
functions
.push_str(" if [ -n \"$ZSH_VERSION\" ] && [ -n \"$SYFTBOX_EMAIL\" ]; then\n");
functions.push_str(
" export POWERLEVEL9K_VIRTUALENV_CONTENT_EXPANSION=\"📦 $SYFTBOX_EMAIL\"\n",
);
Expand Down Expand Up @@ -765,7 +775,7 @@ fn get_shell_functions() -> String {
" # Reset P10k virtualenv display
",
);
functions.push_str(" if [[ -n \"$ZSH_VERSION\" ]]; then\n");
functions.push_str(" if [ -n \"$ZSH_VERSION\" ]; then\n");
functions.push_str(
" export POWERLEVEL9K_VIRTUALENV_CONTENT_EXPANSION='${VIRTUAL_ENV:t}'
",
Expand Down
Loading