From 37ed20a3b9bcfc7070f21de023c3e3d294f48207 Mon Sep 17 00:00:00 2001
From: g0tmi1k <have.you.g0tmi1k@gmail.com>
Date: Thu, 9 Apr 2020 12:10:00 +0100
Subject: [PATCH] Fix a few grammar mistakes

---
 searchsploit | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/searchsploit b/searchsploit
index 07e505173..895aca470 100755
--- a/searchsploit
+++ b/searchsploit
@@ -1,6 +1,6 @@
 #!/bin/bash
 #       Name: SearchSploit - Exploit-DB's CLI search tool
-#    Version: 4.0.6 (2020-04-06)
+#    Version: 4.0.7 (2020-04-09)
 # Written by: Offensive Security, Unix-Ninja, and g0tmi1k
 #   Homepage: https://github.com/offensive-security/exploitdb
 #     Manual: https://www.exploit-db.com/searchsploit
@@ -264,7 +264,7 @@ function validterm()
     || [ "$( echo ${1} | tr '[:upper:]' '[:lower:]' )" == "oracle" ] \
     || [ "$( echo ${1} | tr '[:upper:]' '[:lower:]' )" == "ssh" ] \
     || [ "$( echo ${1} | tr '[:upper:]' '[:lower:]' )" == "unknown" ]; then
-    echo -e "[-] Skipping term: ${1}   (Term is too general. Please re-search manually: $0 ${arg} ${1})\n" 1>&2
+    echo -e "[-] Skipping term: ${1}   (Too generic. You'll need to force a search: $0 ${arg} ${1})\n" 1>&2
     ## Issues, return with something
     return 1
   fi
@@ -299,7 +299,7 @@ function searchsploitout()
     tmp=""
     for word in $( echo ${software} ); do
       ## Add current search term on
-      tmp="${tmp}${word} "
+      tmp="${tmp}${word}"
 
       ## Check to see if its any phrases which would give a TON of incorrect results
       validterm "${tmp}" \
@@ -312,14 +312,18 @@ function searchsploitout()
       ## Are there too many result?
       lines=$( echo -e "${out}" | wc -l )
       if [[ "${lines}" -gt 100 ]]; then
-        echo -e "[-] Skipping output: ${tmp}   (Too many results. Please re-search manually: $0 ${arg} ${tmp})\n" 1>&2
+        echo -e "[-] Skipping output: ${tmp}   (Too many results, 100+. You'll need to force a search: $0 ${arg} ${tmp})\n" 1>&2
       ## Are there any result?
       elif [[ "${lines}" -gt 5 ]]; then
         echo -e "${out}\n\n"
       ## If there's no results
       else
+        ## Exit for loop
         break
       fi
+
+      ## Space out for the next word
+      tmp="${tmp} "
     done
 
     ## Padding between loops
@@ -336,7 +340,7 @@ function searchsploitout()
     ## Are there too many result?
     lines=$( echo -e "${out}" | wc -l )
     if [[ "${lines}" -gt 100 ]]; then
-      echo -e "[-] Skipping output: ${software}   (Too many results. Please re-search manually: $0 ${arg} ${software})\n" 1>&2
+      echo -e "[-] Skipping output: ${software}   (Too many results, 100+. You'll need to force a search: $0 ${arg} ${software})\n" 1>&2
     ## Are there any result?
     elif [[ "${lines}" -gt 5 ]]; then
       echo -e "${out}\n\n"
@@ -492,8 +496,9 @@ function findresults()
   ## Maximum length COL2 can be
   FORMAT_COL2=$(( ${COL2} - 2 ))
 
-  ## Strip un-wanted values
-  SEARCH="${SEARCH} | sed 's/\"//g'"
+  ## Strip un-wanted values from titles
+  #SEARCH="${SEARCH} | sed 's/\"//g"
+  SEARCH="${SEARCH} | sed 's/,\"/,/; s/\"$//;'"
 
 
   ## Remove any terms not wanted from the search
@@ -532,9 +537,11 @@ function findresults()
       | sort )"
   ## Default view
   else
+    echo $SEARCH
     OUTPUT="$( eval ${SEARCH} \
       | awk -F ',' '{ printf "%-'${FORMAT_COL1}'s | %.'${FORMAT_COL2}'s\n", $3, $2 }' \
       | sort )"
+     #| sed 's_,exploits/_,_; s_,shellcodes/_,_; s_,papers/_,_' \
   fi
 
 
@@ -550,7 +557,7 @@ function printresults()
 {
   title_in="${1}"
   path_in="${2}"
-  json_title="$(echo ${title_in} | tr /a-z/ /A-Z/)"
+  json_title="$( echo ${title_in} | tr /a-z/ /A-Z/ )"
 
 
   ## Print header if in JSON ("--json")
@@ -709,16 +716,16 @@ for (( i=0; i<${arraylength}; i++ )); do
   if [[ -f "${files}" ]]; then
     continue
   ## Method #1 - File itself
-  elif [[ -f "$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)/${files_array[${i}]}" ]]; then
-    echo "[i] Found (#1): $(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)/${files_array[${i}]}"
+  elif [[ -f "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/${files_array[${i}]}" ]]; then
+    echo "[i] Found (#1): $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/${files_array[${i}]}"
     echo "[i] To remove this message, please edit \"${rc_file}\" for \"${files_array[${i}]}\" (package_array: ${package_array[${i}]})"
-    path_array[${i}]="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+    path_array[${i}]="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
     echo
   ## Method #2 - Symbolic link
-  elif [[ -f "$(dirname "$(readlink "$0")")/${files_array[${i}]}" ]]; then
-    echo "[i] Found (#2): $(dirname "$(readlink "$0")")/${files_array[${i}]}"
+  elif [[ -f "$( dirname "$( readlink "$0" )" )/${files_array[${i}]}" ]]; then
+    echo "[i] Found (#2): $( dirname "$( readlink "$0" )" )/${files_array[${i}]}"
     echo "[i] To remove this message, please edit \"${rc_file}\" for \"${files_array[${i}]}\" (package_array: ${package_array[${i}]})"
-    path_array[${i}]="$(dirname "$(readlink "$0")")"
+    path_array[${i}]="$( dirname "$( readlink "$0" )" )"
     echo
   else
     #echo "[!] Could not find: ${files}"
@@ -804,7 +811,7 @@ if [[ "${GETPATH}" -eq 1 ]]; then
       title=$( grep -m 1 "${path}" "${files}" | cut -d ',' -f 3 | sed 's/"//g' )
 
       ## File type
-      fileinfo="$(file -b "${location}")"
+      fileinfo="$( file -b "${location}" )"
 
       ## How long is the name?
       PADDING=$(( 9 - ${#name} ))
@@ -904,7 +911,7 @@ for (( i=0; i<${arraylength}; i++ )); do
     printresults "${name_array[${i}]}" "${path_array[${i}]}"
   ## Summary if NOT JSON ("--json")
   elif [[ "${JSON}" -eq 0 ]]; then
-    echo "${name_array[${i}]}s: No Result"
+    echo "${name_array[${i}]}s: No Results"
   fi
   ## Reset
   COLOUR_TAG=""