change search options again; now -q for query is the switch to search by string and -s is the old search by specific package name; these switches make more sense; update sbopkg.8 man page; update TODO

This commit is contained in:
chess.griffin 2008-04-09 14:14:46 +00:00
parent 1edd0b2b9b
commit e1b46f0d1a
3 changed files with 31 additions and 29 deletions

View File

@ -682,7 +682,7 @@ if [ $# -eq 0 ]; then
fi fi
# This is the command line options and help # This is the command line options and help
while getopts ":b:d:f:i:hlrs:v:" OPT; do while getopts ":b:d:f:hlq:rs:v:" OPT; do
case $OPT in case $OPT in
b ) BUILD="$OPTARG" b ) BUILD="$OPTARG"
;; ;;
@ -690,13 +690,13 @@ while getopts ":b:d:f:i:hlrs:v:" OPT; do
;; ;;
f ) SBOPKG_CONF="$OPTARG" f ) SBOPKG_CONF="$OPTARG"
;; ;;
i ) SEARCH="$OPTARG"
;;
l ) CHANGELOG=1 l ) CHANGELOG=1
;; ;;
q ) GENSEARCH="$OPTARG"
;;
r ) RSYNC=1 r ) RSYNC=1
;; ;;
s ) GENSEARCH="$OPTARG" s ) SEARCH="$OPTARG"
;; ;;
v ) VERSION=1 v ) VERSION=1
CUSTOMVER="$OPTARG" CUSTOMVER="$OPTARG"
@ -712,18 +712,18 @@ SlackBuilds.org repository"
echo " -f Override default configuration file" echo " -f Override default configuration file"
echo " with specified file." echo " with specified file."
echo " -h Display this help message." echo " -h Display this help message."
echo " -i package Search by specific package name and, \
if found,"
echo " display package information."
echo " -l Display the SlackBuilds.org \ echo " -l Display the SlackBuilds.org \
ChangeLog.txt and then quit." ChangeLog.txt and then quit."
echo " -q package Query for packages matching string."
echo " -r Rsync the SlackBuilds.org repository with" echo " -r Rsync the SlackBuilds.org repository with"
echo " the local mirror and then quit." echo " the local mirror and then quit."
echo " -s package General search for a package name." echo " -s package Search by specific package name and, \
if found,"
echo " display package information."
echo " -v version Set the Slackware version for the" echo " -v version Set the Slackware version for the"
echo " mirror (current choices are 11.0 and 12.0)" echo " mirror (current choices are 11.0 and 12.0)"
echo echo
echo "Note: multiple arguments to -b, -i, and -s must be \ echo "Note: multiple arguments to -b, -q, and -s must be \
quoted (\"pkg1 pkg2\")" quoted (\"pkg1 pkg2\")"
exit exit
;; ;;

View File

@ -15,10 +15,12 @@ Sbopkg TODO (in no particular order)
checklist or radiolist would not present the current 'view' menu. checklist or radiolist would not present the current 'view' menu.
Not sure how the order of packages selected would be set. Not sure how the order of packages selected would be set.
* Add ability to view more than just the README from the command line. * Add ability to view more than just the README from the command line.
This was added, but it needs to be improved. This was added, but it needs to be improved. UPDATED: This works
much better now.
* Include ability to work with more than one repo with different * Include ability to work with more than one repo with different
Slackware versions, i.e. /home/sbo/11.0 and /home/sbo/12.0. The Slackware versions, i.e. /home/sbo/11.0 and /home/sbo/12.0. The
first menu in the dialog after selecting "Browse" would be a menu first menu in the dialog after selecting "Browse" would be a menu
showing the various Slackware versions in the local mirror. showing the various Slackware versions in the local mirror. UPDATED:
This has been added to SVN and should appear in version 0.0.6.
* More error checking. * More error checking.
* General code cleanups. * General code cleanups.

View File

@ -64,7 +64,7 @@ than one package is specified, they must be in quotes. For example
.TP 5 .TP 5
.B -d DIRECTORY .B -d DIRECTORY
Manually specify the full path to the DIRECTORY containing the Manually specify the full path to the DIRECTORY containing the
local SBo repository local SBo repository.
.TP 5 .TP 5
.B -f .B -f
@ -74,29 +74,29 @@ file.
.TP 5 .TP 5
.B -h .B -h
Display the help Display the help.
.TP 5 .TP 5
.B -i PACKAGE(s) .B -l
Display the SBo ChangeLog.txt and quit.
.TP 5
.B -q PACKAGE(s)
Query for PACKAGE(s) by glob. For example, 'sbopkg -q nv' will return
a list of matches, such as the nvidia packages, konversation, and
other packages with 'nv' in their name.
.TP 5
.B -r
Rsync the local repository with SlackBuilds.org and quit.
.TP 5
.B -s PACKAGE(s)
Search for PACKAGE(s) by specific PACKAGE name and, if found, display Search for PACKAGE(s) by specific PACKAGE name and, if found, display
the README, SlackBuild, .info, and slack-desc files in that order the README, SlackBuild, .info, and slack-desc files in that order
using $PAGER, which defaults to 'more' as decribed above. If more using $PAGER, which defaults to 'more' as decribed above. If more
than one package is specified, they must be in quotes. For example than one package is specified, they must be in quotes. For example
"sbopkg -i "foo bar". "sbopkg -s "foo bar".
.TP 5
.B -l
Display the SBo ChangeLog.txt and quit
.TP 5
.B -r
Rsync the local repository with SlackBuilds.org and quit
.TP 5
.B -s PACKAGE(s)
Search for PACKAGE(s) by glob. For example, 'sbopkg -s nv' will return
a list of matches, such as the nvidia packages, konversation, and
other packages with 'nv' in their name.
.TP 5 .TP 5
.B -v VERSION .B -v VERSION