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

Jump to bottom

check if bashrc exists before running it #170870

Merged
merged 3 commits into from
Jan 9, 2023
Merged

check if bashrc exists before running it #170870

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4b24ce
fix #170868
meganrogge Jan 9, 2023
42ca2e3
Update src/vs/workbench/contrib/terminal/browser/media/shellIntegrati…
meganrogge Jan 9, 2023
1f4defd
Merge branch 'main' into merogge/bash-sh
meganrogge Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ VSCODE_SHELL_INTEGRATION=1
# Run relevant rc/profile only if shell integration has been injected, not when run manually
if [ "$VSCODE_INJECTION" == "1" ]; then
if [ -z "$VSCODE_SHELL_LOGIN" ]; then
. ~/.bashrc
if [ -f ~/.bashrc ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

better to use [ -r ~/.bashrc ]

Copy link
Member

Choose a reason for hiding this comment

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

Thanks #171495

. ~/.bashrc
fi
else
# Imitate -l because --init-file doesn't support it:
# run the first of these files that exists
Expand Down