From 7896f28df115c79126f8039ff557e7daee2fbd66 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Thu, 13 Dec 2007 17:14:57 +0000
Subject: [PATCH] * Follow conventions and rename -i (for printing verbose
 info) to -v.

* Make usage string look a bit more 'standard'.
---
 usr.bin/pkg_search/pkg_search.1  | 12 ++++++------
 usr.bin/pkg_search/pkg_search.sh | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/usr.bin/pkg_search/pkg_search.1 b/usr.bin/pkg_search/pkg_search.1
index 20ea800a80..fe6af44717 100644
--- a/usr.bin/pkg_search/pkg_search.1
+++ b/usr.bin/pkg_search/pkg_search.1
@@ -24,9 +24,9 @@
 .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $DragonFly: src/usr.bin/pkg_search/pkg_search.1,v 1.2 2007/12/04 21:55:01 swildner Exp $
+.\" $DragonFly: src/usr.bin/pkg_search/pkg_search.1,v 1.3 2007/12/13 17:14:57 swildner Exp $
 .\"
-.Dd December 4, 2007
+.Dd December 13, 2007
 .Dt PKG_SEARCH 1
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Nd print information about a package
 .Sh SYNOPSIS
 .Nm
-.Op Fl ik
+.Op Fl k | v
 .Ar package
 .Sh DESCRIPTION
 .Nm
@@ -45,10 +45,10 @@ index for a given
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl i
-Print verbose information (Ports directory, URL, depencies)
 .It Fl k
 Also query the Info and WWW field.
+.It Fl v
+Print verbose information (Ports directory, URL, depencies)
 .El
 .Sh EXAMPLES
 The following is an example of a typical usage
@@ -56,7 +56,7 @@ of the
 .Nm
 command:
 .Pp
-.Dl "pkg_search -i fvwm2"
+.Dl "pkg_search -v fvwm2"
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
diff --git a/usr.bin/pkg_search/pkg_search.sh b/usr.bin/pkg_search/pkg_search.sh
index a025ba370e..d6c25d06e3 100644
--- a/usr.bin/pkg_search/pkg_search.sh
+++ b/usr.bin/pkg_search/pkg_search.sh
@@ -25,7 +25,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $DragonFly: src/usr.bin/pkg_search/pkg_search.sh,v 1.2 2007/12/12 23:26:38 dillon Exp $
+# $DragonFly: src/usr.bin/pkg_search/pkg_search.sh,v 1.3 2007/12/13 17:14:57 swildner Exp $
 
 UNAME=`uname -s`
 VERSION=`uname -r | cut -d '.' -f 1,2`
@@ -60,38 +60,38 @@ if [ $UNAME = "DragonFly" ]; then
 fi
 
 if [ -z $1 ]; then 
-        echo "Usage: $0 [ -i | -k ] <name>"
+        echo "usage: $0 [-k | -v] package"
         exit 1  
 fi
 
 
 case "$1" in
-	-i)
+	-k)
 		if [ ${SIMPLE} -eq 1 ]; then
 			grep "PKGNAME=$2" ${PKGSUM} | cut -d '=' -f 2
 			exit 1
 		fi
 		awk -F\| -v name="$2" \
 	    '{\
-		    if ($1 ~ name) { \
+		    if ($1 ~ name || $4 ~ name || $10 ~ name) { \
 			    split($2, a, "/"); \
-			    printf("Name\t: %s-50\nDir\t: %-50s\nDesc\t: %-50s\nURL\t: %-50s\nDeps\t: %s\n\n", $1, $2, $4, $10, $9); \
+			    printf("%-20s\t%-25s\n", $1, $4); \
 		    }
 	    }' ${PORTSDIR}/${INDEXFILE}
+
 	;;
-	-k)
+	-v)
 		if [ ${SIMPLE} -eq 1 ]; then
 			grep "PKGNAME=$2" ${PKGSUM} | cut -d '=' -f 2
 			exit 1
 		fi
 		awk -F\| -v name="$2" \
 	    '{\
-		    if ($1 ~ name || $4 ~ name || $10 ~ name) { \
+		    if ($1 ~ name) { \
 			    split($2, a, "/"); \
-			    printf("%-20s\t%-25s\n", $1, $4); \
+			    printf("Name\t: %s-50\nDir\t: %-50s\nDesc\t: %-50s\nURL\t: %-50s\nDeps\t: %s\n\n", $1, $2, $4, $10, $9); \
 		    }
 	    }' ${PORTSDIR}/${INDEXFILE}
-
 	;;
 	*)
 		if [ ${SIMPLE} -eq 1 ]; then
-- 
2.41.0