Skip to content

t2955: Replace blanket 2>/dev/null with explicit file checks in shell-env.sh #2969

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

Closed
marcusquinn wants to merge 1 commit into from
+3 −3
Closed

t2955: Replace blanket 2>/dev/null with explicit file checks in shell-env.sh #2969

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
6 changes: 3 additions & 3 deletions setup-modules/shell-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ setup_shellcheck_wrapper() {
# shells, so SHELLCHECK_PATH set only in .zshrc is invisible to the LSP.
local zshenv="$HOME/.zshenv"
if [[ -f "$zshenv" ]] || command -v zsh >/dev/null 2>&1; then
if grep -q 'SHELLCHECK_PATH' "$zshenv" 2>/dev/null; then
if [[ -f "$zshenv" ]] && grep -q 'SHELLCHECK_PATH' "$zshenv"; then
already_in="${already_in:+$already_in, }$zshenv"
else
touch "$zshenv"
Expand All @@ -529,8 +529,8 @@ setup_shellcheck_wrapper() {
touch "$rc_file"
fi

# Check if already added
if grep -q 'SHELLCHECK_PATH' "$rc_file" 2>/dev/null; then
# Check if already added (file existence guaranteed by check above)
if grep -q 'SHELLCHECK_PATH' "$rc_file"; then
already_in="${already_in:+$already_in, }$rc_file"
continue
fi
Expand Down