mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-12 21:10:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve cli searching; the old -s is now -i (for information) and will display package info files; the new -s is just a general grep search for any glob

Browse Source
This commit is contained in:
chess.griffin 2008-04-07 13:55:55 +00:00
parent 95685a1d89
commit 7299eeffb4
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/usr/bin/sbopkg
View File

@ -402,8 +402,8 @@ if [ ! $(find -name "$PKG") ]; then
dialog --title "ERROR" --msgbox "Package $PKG not found" 0 0
continue
else
echo "$SCRIPT: Package $PKG not found. Exiting." 1>&2
exit 1
echo "$SCRIPT: Package $PKG not found." 1>&2
continue
fi
fi
. $PKGPATH/$PKG.info
@ -412,6 +412,30 @@ SRCNAME=${DOWNLOAD##*/}
cd -
}
gen_search_package () {
# Search for package name glob generally using grep. Only used with
# cli not dialog.
cd $LOCALREPO/$SLACKVER
PKG=$1
RESULTS=$(find . -type d | grep $PKG | sed -e 's/.\///')
if [ -n "$RESULTS" ]; then
echo "Found the following matches for $PKG:"
for i in $RESULTS; do
echo $i
done
continue
else
if [ "$DIAG" = 1 ]; then
dialog --title "ERROR" --msgbox "Package $PKG not found" 0 0
continue
else
echo "$SCRIPT: No match for $PKG found." 1>&2
continue
fi
fi
cd -
}
show_readme () {
# Show the package's text files.
# Thanks to slakmagik, this works much better. I may still look at
@ -646,7 +670,7 @@ if [ $# -eq 0 ]; then
fi
# This is the command line options and help
while getopts ":b:d:f:hlrs:v:" OPT; do
while getopts ":b:d:f:i:hlrs:v:" OPT; do
case $OPT in
b ) BUILD="$OPTARG"
;;
@ -654,11 +678,13 @@ while getopts ":b:d:f:hlrs:v:" OPT; do
;;
f ) SBOPKG_CONF="$OPTARG"
;;
i ) SEARCH="$OPTARG"
;;
l ) CHANGELOG=1
;;
r ) RSYNC=1
;;
s ) SEARCH="$OPTARG"
s ) GENSEARCH="$OPTARG"
;;
v ) VERSION=1
CUSTOMVER="$OPTARG"
@ -674,16 +700,18 @@ SlackBuilds.org repository"
echo " -f Override default configuration file"
echo " with specified file."
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 \
ChangeLog.txt and then quit."
echo " -r Rsync the SlackBuilds.org repository with"
echo " the local mirror and then quit."
echo " -s package Search for a package and, if found, \
display package information."
echo " -s package General search for a package name."
echo " -v version Set the Slackware version for the"
echo " mirror (current choices are 11.0 and 12.0)"
echo
echo "Note: multiple arguments to -b and -s must be \
echo "Note: multiple arguments to -b, -i, and -s must be \
quoted (\"pkg1 pkg2\")"
exit
;;
@ -750,6 +778,14 @@ if [ -n "$SEARCH" ]; then
exit 0
fi
if [ -n "$GENSEARCH" ]; then
for PKGSEARCH in $GENSEARCH; do
echo "Searching for $PKGSEARCH"
gen_search_package $PKGSEARCH
done
exit 0
fi
if [ -n "$VERSION" ]; then
SLACKVER=$NEWVER
fi