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

fix bugs when searching for multiple words or for spaces #36

Closed
wants to merge 2 commits into from
Closed

fix bugs when searching for multiple words or for spaces #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff933f
fix bugs when searching for multiple words or for spaces
subraizada3 Jun 14, 2019
9f07aa7
fix bug when searching for slashes
subraizada3 Jun 23, 2019
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 spot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ done
if [[ "$1" == "--" ]]; then shift; fi

# check for directory as first parameter
if [[ "$1" =~ / ]]; then
if [[ "$1" =~ / ]] && [[ "$1" =~ [^\/] ]]; then
if [ -d "$1" ]; then
dir=${1/%\//}
shift
fi
fi

# check for empty search
if [ -z "$@" ]; then
if [[ -z "$@" ]]; then
echo "(no search term. \`spot -h\` for usage)"
exit 1
fi
Expand Down Expand Up @@ -160,7 +160,7 @@ fi

# run search
eval "find $dir $findopt -type f $exclude -print0" \
| GREP_COLOR="1;33;40" xargs -0 grep "${grepopt[@]}" -e "$@" \
| GREP_COLOR="1;33;40" xargs -0 grep "${grepopt[@]}" -e "`echo \"$@\"`" \
| sed "s/^\([^:]*:\)\(.*\)/ \\
$cyan\1$reset \\
\2 /" \
Expand Down