Skip to content

Add virtualenv prompt for robbyrussell theme #2060

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

Jump to bottom
Merged
merged 6 commits into from
Apr 30, 2025
Merged

Add virtualenv prompt for robbyrussell theme #2060

merged 6 commits into from
Apr 30, 2025

Conversation

petarnikolovski
Copy link
Contributor

Description

Added virtualenv prompt for robbyrussell theme (same as in the purity theme)

Motivation and Context

Usually when one cd into directory with active virtualenv name of the virtualenv is displayed on the left hand side in parentheses.

How Has This Been Tested?

cd into and out of the directory with virtualenv has desired effect

Screenshots (if appropriate):

https://imgur.com/D0ZG5Nc

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • If my change requires a change to the documentation, I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • If I have added a new file, I also added it to clean_files.txt and formatted it using lint_clean_files.sh.
  • I have added tests to cover my changes, and all the new and existing tests pass.

gaelicWizard
gaelicWizard requested changes Jan 25, 2022
View reviewed changes
davidpfarrell
davidpfarrell reviewed Jan 25, 2022
View reviewed changes
davidpfarrell
davidpfarrell suggested changes Jan 25, 2022
View reviewed changes
Copy link
Contributor

@davidpfarrell davidpfarrell left a comment

Choose a reason for hiding this comment

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

Greetings and thanks for submitting a PR !

I have a comment regarding placement of the new prompt - feels a bit out of place at the very start of the prompt line ... My suggestion would be to place it after the scm prompt segment ...

gaelicWizard
gaelicWizard approved these changes Jan 26, 2022
View reviewed changes
Copy link
Contributor

@gaelicWizard gaelicWizard left a comment

Choose a reason for hiding this comment

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

LGTM

gaelicWizard
gaelicWizard requested changes Jan 26, 2022
View reviewed changes
Copy link
Contributor

@gaelicWizard gaelicWizard left a comment

Choose a reason for hiding this comment

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

Seems we already have a variation on venv_prompt! It would be better to use, or enhance, those rather than create a duplicate.

gaelicWizard
gaelicWizard approved these changes Jan 27, 2022
View reviewed changes
Copy link
Contributor

@gaelicWizard gaelicWizard left a comment

Choose a reason for hiding this comment

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

Looks great to me! 😃

@petarnikolovski
Copy link
Contributor Author

@davidpfarrell @gaelicWizard any update on this, is it ready to be merged? ☺️

davidpfarrell
davidpfarrell reviewed Feb 6, 2022
View reviewed changes
themes/base.theme.bash Outdated
Comment on lines 629 to 638
function conda_or_venv_prompt() {
local python_venv=""
if [[ -n "${CONDA_DEFAULT_ENV:-}" ]]; then
python_venv=$(condaenv_prompt)
PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
elif [[ -n "${VIRTUAL_ENV:-}" ]]; then
python_venv=$(virtualenv_prompt)
fi
[[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}"
}
Copy link
Contributor

Choose a reason for hiding this comment

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

This function should probably live closer to the existing functions.

NOTE: PYTHON_VENV_CHAR and CONDA_PYTHON_VENV_CHAR are only used by the themes that do not invoke the virtualenv_prompt or condaenv_prompt functions. Those function use PYTHON_THEME_PROMPT_PREFIX and PYTHON_THEME_PROMPT_SUFFIX

The spirit of the methods that live in this base theme is to use the PREFIX and SUFFIX variables.

I think this function just becomes:

	if [[ -n "${CONDA_DEFAULT_ENV:-}" ]]; then
		condaenv_prompt
	elif [[ -n "${VIRTUAL_ENV:-}" ]]; then
		virtualenv_prompt
	fi

Copy link
Member

Choose a reason for hiding this comment

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

hi @petarnikolovski, want to continue and improve this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@NoahGorny Sorry for the late response, I will make moves on improvement soon, I couldn't manage because of my work schedule.

@seefood
Copy link
Contributor

seefood commented Nov 7, 2024

Hey there @petarnikolovski , do you want to finish this PR, or merge it as is?

@seefood seefood self-assigned this Nov 7, 2024
@seefood seefood added seems abandoned rattle the cage, and close if nobody wants to keep it going waiting-for-response labels Nov 7, 2024
@petarnikolovski
Copy link
Contributor Author

@seefood Hi, I'm swamped with work and cannot continue working on this. I'm ok with the merge as is. Otherwise, we can close this.

@seefood seefood marked this pull request as draft November 12, 2024 19:13
@seefood
Copy link
Contributor

seefood commented Nov 12, 2024

@petarnikolovski ok, I'll circle back to it some day, I want to make sure I understood the affect correctly.

@seefood seefood marked this pull request as ready for review April 30, 2025 12:06
github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 30, 2025
View reviewed changes
themes/robbyrussell/robbyrussell.theme.bash
@@ -13,13 +13,16 @@
RVM_THEME_PROMPT_PREFIX="|"
RVM_THEME_PROMPT_SUFFIX="|"

VIRTUALENV_THEME_PROMPT_PREFIX='('

Check warning

Code scanning / shellcheck

SC2034 Warning

VIRTUALENV_THEME_PROMPT_PREFIX appears unused. Verify use (or export if used externally).
themes/robbyrussell/robbyrussell.theme.bash
@@ -13,13 +13,16 @@
RVM_THEME_PROMPT_PREFIX="|"
RVM_THEME_PROMPT_SUFFIX="|"

VIRTUALENV_THEME_PROMPT_PREFIX='('
VIRTUALENV_THEME_PROMPT_SUFFIX=') '

Check warning

Code scanning / shellcheck

SC2034 Warning

VIRTUALENV_THEME_PROMPT_SUFFIX appears unused. Verify use (or export if used externally).
seefood
seefood reviewed Apr 30, 2025
View reviewed changes
@seefood seefood merged commit 35c68b6 into Bash-it:master Apr 30, 2025
4 of 6 checks passed
akinomyoga
akinomyoga reviewed Apr 30, 2025
View reviewed changes
@akinomyoga akinomyoga mentioned this pull request Apr 30, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seefood seefood seefood approved these changes

@akinomyoga akinomyoga akinomyoga left review comments

@NoahGorny NoahGorny NoahGorny left review comments

@davidpfarrell davidpfarrell davidpfarrell requested changes

@gaelicWizard gaelicWizard gaelicWizard approved these changes

Assignees

@seefood seefood

Labels
seems abandoned rattle the cage, and close if nobody wants to keep it going
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@petarnikolovski @seefood @gaelicWizard @akinomyoga @NoahGorny @davidpfarrell