improve search

rush

@@ -1773,17 +1773,17 @@ rush_search_command() {
     prefix=''
     [[ "$repo" != "default" ]] && prefix="$repo:"
 
-    blue "Matching packages:\n"
-    find "$repo_path" -type d |
-      grep -v "$repo_path.*/\." |
-      grep --color=always "$text" |
-      sed "s#${repo_path}/#${prefix}#g"
+    bold "Matching packages ($repo):\n"
+    find "$repo_path" -type f -name main |
+      sed "s#${repo_path}/#${prefix}#g; s#/main##" |
+      grep --color=always --ignore-case "$text" |
+      sort
 
-    blue "\nMatching info files:\n"
+    bold "\nMatching info files ($repo):\n"
     grep --color=always --initial-tab --recursive --ignore-case --include "info" \
       "$text" "$repo_path" |
-      sort |
-      sed "s#${repo_path}/#${prefix}#g" | sed 's#/info##'
+      sed "s#${repo_path}/#${prefix}#g; s#/info##" |
+      sort
 
     echo
   }

src/search_command.sh

@@ -10,18 +10,18 @@ search_repo() {
   [[ "$repo" != "default" ]] && prefix="$repo:"
 
   ## Search directories matching search text
-  blue "Matching packages:\n"
-  find "$repo_path" -type d |
-    grep -v "$repo_path.*/\." |
-    grep --color=always "$text" |
-    sed "s#${repo_path}/#${prefix}#g"
+  bold "Matching packages ($repo):\n"
+  find "$repo_path" -type f -name main |
+    sed "s#${repo_path}/#${prefix}#g; s#/main##" |
+    grep --color=always --ignore-case "$text" |
+    sort
 
   ## Search info files matching search text
-  blue "\nMatching info files:\n"
+  bold "\nMatching info files ($repo):\n"
   grep --color=always --initial-tab --recursive --ignore-case --include "info" \
     "$text" "$repo_path" |
-    sort |
-    sed "s#${repo_path}/#${prefix}#g" | sed 's#/info##'
+    sed "s#${repo_path}/#${prefix}#g; s#/info##" |
+    sort
 
   echo
 }

test/approvals/rush_search_hello

@@ -1,15 +1,15 @@
-Matching packages:
+Matching packages (default):
 
 hello
-
-Matching info files:
+
+Matching info files (default):
 
 hello:	  $ rush info hello
 
-Matching packages:
+Matching packages (sample):
 
 sample:hello
-
-Matching info files:
+
+Matching info files (sample):
 
 sample:hello:	  $ rush info hello

test/approvals/rush_search_running

@@ -1,15 +1,15 @@
-Matching packages:
+Matching packages (default):
 
-
-Matching info files:
+
+Matching info files (default):
 
 hello:	This info file can be accessed by running
 nested/hi:	This info file can be accessed by running
 
-Matching packages:
+Matching packages (sample):
 
-
-Matching info files:
+
+Matching info files (sample):
 
 sample:hello:	This info file can be accessed by running
 sample:nested/hi:	This info file can be accessed by running