From 3a55e8b3ef20668a2488f9fb770bc7d5c0afb158 Mon Sep 17 00:00:00 2001
From: "chess.griffin" <chess.griffin@18908463-3d48-0410-af50-6b38eb639d31>
Date: Mon, 23 Feb 2009 21:50:38 +0000
Subject: [PATCH] commit slakmagik's patch implement a feature request that
 allows user to do a string search by installed packages only; thanks to
 slakmagik for the patch

---
 src/usr/bin/sbopkg | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/usr/bin/sbopkg b/src/usr/bin/sbopkg
index 3cb11ab..814d5ad 100755
--- a/src/usr/bin/sbopkg
+++ b/src/usr/bin/sbopkg
@@ -1640,7 +1640,24 @@ gen_search_package () {
 }
 
 string_search() {
-    local SEARCH_TERM="$1"
+    # if the search string is prefixed with 'inst:', then the user only wants
+    # to search installed packages, so this shaves the 'inst:' off, and
+    # generates a potentially huge path consisting only of installed *SBo
+    # packages to hand to find. Otherwise, just search for $1 in REPO as
+    # usual.
+    if [[ "${SEARCH_TERM%%:*}" == "inst" ]]; then
+        local SEARCH_TERM="${SEARCH_TERM#*:}"
+        local SBOPKGS=($(ls /var/log/packages/*_SBo))
+        for (( i=0; i<${#SBOPKGS[*]}; i++ )); do
+            local PKGNAME=$(echo ${SBOPKGS[$i]} |
+                sed 's,.*/,,;s/-[^-]*-[^-]*-[^-]*$//')
+            local INST_PKGS+="$LOCALREPO/$SLACKVER/*/$PKGNAME "
+        done
+        local FIND_PATH="$INST_PKGS"
+    else
+        local SEARCH_TERM="$1"
+        local FIND_PATH="$REPO"
+    fi
     local REPO="$LOCALREPO/$SLACKVER"
     local MENU_FILE=$TMP/sbopkg_menu-file
     local PICKED_FILE=$TMP/sbopkg_picked-file
@@ -1649,7 +1666,7 @@ string_search() {
     # the sed expression processes find's output into data usable for the menu
     # file but the first two parts are needed to sanitize the input - which
     # raises the question of true general sanitizing of this input
-    ( find $REPO -iname 'README' -exec egrep -iwm1 "$SEARCH_TERM" {} + |
+    ( find $FIND_PATH -iname 'README' -exec egrep -iwm1 "$SEARCH_TERM" {} + |
         sed "
             s,\",\',g
             s/\\\/\\\\\\\\/g
@@ -2786,12 +2803,15 @@ main_search() {
                 <PKG> search or a string <String> search.\n\nThe package \
                 search executes a glob search on package names in \
                 $REPO.\n\nThe string search executes 'grep -iwm1 \
-                \"<your_string>\"' on the README files in the repo. This \
+                \"your_string\"' on the README files in the repo. This \
                 means it returns the first matching line from the README \
                 files, where the line contains a case-insensitive word \
                 that matches your string, where a 'word' is a sequence of \
                 alphanumeric characters and underscores. For details, see \
-                the egrep(1) manual page.")" 0 0
+                the egrep(1) manual page.\n\nIf the search string is \
+                prefixed with \"inst:\" in the form \"inst:your_string\", \
+                then it will search for \"your_string\" within installed \
+                packages only.")" 0 0
                 continue
                 ;;
             0) PKG=yes ;;