Merge branch 'g0tmi1k-osx'
This commit is contained in:
commit
1f858f098b
1 changed files with 9 additions and 6 deletions
11
searchsploit
11
searchsploit
|
@ -191,7 +191,7 @@ done
|
||||||
|
|
||||||
|
|
||||||
## Print the full path. If pbcopy/xclip is available then copy to the clipboard
|
## Print the full path. If pbcopy/xclip is available then copy to the clipboard
|
||||||
if [[ "${GETPATH}" -eq '1' ]]; then
|
if [[ "${GETPATH}" -eq 1 ]]; then
|
||||||
## Get EDB-ID from input
|
## Get EDB-ID from input
|
||||||
edbdb="$( echo ${TAGS} | tr -dc '0-9' )"
|
edbdb="$( echo ${TAGS} | tr -dc '0-9' )"
|
||||||
## Check files.csv
|
## Check files.csv
|
||||||
|
@ -250,7 +250,7 @@ fi
|
||||||
if [[ "${WEBLINK}" -eq 1 ]]; then
|
if [[ "${WEBLINK}" -eq 1 ]]; then
|
||||||
COL2=45
|
COL2=45
|
||||||
else
|
else
|
||||||
COL2=35
|
COL2=$(( ${#gitpath} + 15 ))
|
||||||
fi
|
fi
|
||||||
COL1=$(( $( tput cols ) - COL2 - 1 ))
|
COL1=$(( $( tput cols ) - COL2 - 1 ))
|
||||||
|
|
||||||
|
@ -292,7 +292,10 @@ else
|
||||||
for tag in ${TAGS}; do
|
for tag in ${TAGS}; do
|
||||||
## If we are to use colour, add the values to search for between "or"
|
## If we are to use colour, add the values to search for between "or"
|
||||||
if [[ "${COLOUR}" -eq 1 ]]; then
|
if [[ "${COLOUR}" -eq 1 ]]; then
|
||||||
COLOUR_TAG="${COLOUR_TAG}\|${tag}"
|
if [[ "${COLOUR_TAG}" ]]; then
|
||||||
|
COLOUR_TAG="${COLOUR_TAG}\|"
|
||||||
|
fi
|
||||||
|
COLOUR_TAG="${COLOUR_TAG}${tag}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## Search both title and path?
|
## Search both title and path?
|
||||||
|
@ -313,7 +316,7 @@ else
|
||||||
|
|
||||||
## Case sensitive?
|
## Case sensitive?
|
||||||
if [[ "${SCASE}" -eq 1 ]]; then
|
if [[ "${SCASE}" -eq 1 ]]; then
|
||||||
EARCH="${SEARCH}${tag}"
|
SEARCH="${SEARCH}${tag}"
|
||||||
else
|
else
|
||||||
SEARCH="${SEARCH}$( echo ${tag} | tr '[:upper:]' '[:lower:]' )"
|
SEARCH="${SEARCH}$( echo ${tag} | tr '[:upper:]' '[:lower:]' )"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue