From cb3599a312ff7e67eea0f87369a4de12894b211d Mon Sep 17 00:00:00 2001 From: David Chin Date: Tue, 27 Jul 2021 17:21:59 -0400 Subject: [PATCH 1/2] lib/grep: Avoid alias expansions on the first argument of grep (Fix #229) --- lib/grep.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/grep.sh b/lib/grep.sh index 5aa8a21..4f16819 100644 --- a/lib/grep.sh +++ b/lib/grep.sh @@ -21,7 +21,9 @@ elif grep_flag_available --exclude=.cvs; then fi # export grep settings -alias grep="grep ${GREP_OPTIONS[*]}" +if ((${#GREP_OPTIONS[@]} > 0)); then + alias grep="grep ${GREP_OPTIONS[*]}" +fi # clean up unset GREP_OPTIONS From 9b240245bba9901f511da1e4d38529c7436a73d2 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sun, 2 Jan 2022 00:25:30 +0900 Subject: [PATCH 2/2] lib/grep: Refactor variable and function names to avoid conflicts --- lib/grep.sh | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/grep.sh b/lib/grep.sh index 4f16819..4a5f006 100644 --- a/lib/grep.sh +++ b/lib/grep.sh @@ -1,31 +1,32 @@ #!/usr/bin/env bash + # is x grep argument available? -grep_flag_available() { - echo | grep $1 "" >/dev/null 2>&1 +_omb_grep_flag_available() { + echo | grep $1 "" >/dev/null 2>&1 } -GREP_OPTIONS=() +_omb_grep_options=() # color grep results -if grep_flag_available --color=auto; then - GREP_OPTIONS+=( "--color=auto" ) +if _omb_grep_flag_available --color=auto; then + _omb_grep_options+=( "--color=auto" ) fi # ignore VCS folders (if the necessary grep flags are available) -VCS_FOLDERS="{.bzr,CVS,.git,.hg,.svn}" +_omb_grep_vcs_folders="{.bzr,CVS,.git,.hg,.svn}" -if grep_flag_available --exclude-dir=.cvs; then - GREP_OPTIONS+=( "--exclude-dir=$VCS_FOLDERS" ) -elif grep_flag_available --exclude=.cvs; then - GREP_OPTIONS+=( "--exclude=$VCS_FOLDERS" ) +if _omb_grep_flag_available --exclude-dir=.cvs; then + _omb_grep_options+=( "--exclude-dir=$_omb_grep_vcs_folders" ) +elif _omb_grep_flag_available --exclude=.cvs; then + _omb_grep_options+=( "--exclude=$_omb_grep_vcs_folders" ) fi # export grep settings -if ((${#GREP_OPTIONS[@]} > 0)); then - alias grep="grep ${GREP_OPTIONS[*]}" +if ((${#_omb_grep_options[@]} > 0)); then + alias grep="grep ${_omb_grep_options[*]}" fi # clean up -unset GREP_OPTIONS -unset VCS_FOLDERS -unset -f grep_flag_available +unset -v _omb_grep_options +unset -v _omb_grep_vcs_folders +unset -f _omb_grep_flag_available