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

made it possible to specify the b,g,i,s flags multiple times

Browse Source 
Previously, the user had to quote multiple arguments to a single flag.
This is still possible but now there's the option of using the flags
multiple times with a single arg to each with no quoting.
This commit is contained in:
slakmagik 2010-06-29 14:56:46 +00:00
parent 3a92318fa8
commit f5efdc1fea
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/usr/sbin/sbopkg
View File

@ -4151,7 +4151,7 @@ search_and_display() {
# pick_file()/show_readme(). There, we need to expand globs and will be # pick_file()/show_readme(). There, we need to expand globs and will be
# using full paths or be in the right directory to do so. # using full paths or be in the right directory to do so.
set -f set -f
for PKGSEARCH in $SEARCH; do for PKGSEARCH in ${SEARCH[*]}; do
echo "Searching for $PKGSEARCH" echo "Searching for $PKGSEARCH"
if search_package $PKGSEARCH; then if search_package $PKGSEARCH; then
if (( ${#PKGPATH[*]} > 1 )); then if (( ${#PKGPATH[*]} > 1 )); then
@ -4169,6 +4169,7 @@ search_and_display() {
# insists upon. Otherwise, I'd just show the default files. # insists upon. Otherwise, I'd just show the default files.
pick_file info $PKGPATH $PKGSEARCH pick_file info $PKGPATH $PKGSEARCH
show_readme $PKGPATH $PKGSEARCH show_readme $PKGPATH $PKGSEARCH
read -n1 -ep "Hit any key to continue: "
else else
echo "$SCRIPT: package \"$PKGSEARCH\" not found." >&2 echo "$SCRIPT: package \"$PKGSEARCH\" not found." >&2
fi fi
@ -4422,7 +4423,7 @@ while getopts ":b:cd:e:f:g:hi:kloPpqrRs:uV:v" OPT; do
b ) # Build b ) # Build
BFLAG=1 BFLAG=1
TYPE="build" TYPE="build"
BUILDLIST="$OPTARG" BUILDLIST+=("$OPTARG")
unset DIAG unset DIAG
;; ;;
c ) # Check for updates to installed SBo packages c ) # Check for updates to installed SBo packages
@ -4440,13 +4441,13 @@ while getopts ":b:cd:e:f:g:hi:kloPpqrRs:uV:v" OPT; do
SBOPKG_CONF=$OPTARG SBOPKG_CONF=$OPTARG
;; ;;
g ) # String search g ) # String search
GENSEARCH="$OPTARG" GENSEARCH+=("$OPTARG")
unset DIAG unset DIAG
;; ;;
i ) # Build and install i ) # Build and install
IFLAG=1 IFLAG=1
TYPE="buildinstall" TYPE="buildinstall"
BUILDLIST="$OPTARG" BUILDLIST+=("$OPTARG")
unset DIAG unset DIAG
;; ;;
k ) # Skip installed packages k ) # Skip installed packages
@ -4482,7 +4483,7 @@ while getopts ":b:cd:e:f:g:hi:kloPpqrRs:uV:v" OPT; do
unset DIAG unset DIAG
;; ;;
s ) # Name search s ) # Name search
SEARCH="$OPTARG" SEARCH+=("$OPTARG")
unset DIAG unset DIAG
;; ;;
u ) # Search an updated sbopkg package u ) # Search an updated sbopkg package
@ -4618,7 +4619,7 @@ else
> $SBOPKGTMP/sbopkg_user_queue.lck > $SBOPKGTMP/sbopkg_user_queue.lck
> $MISSING_LIST_FILE > $MISSING_LIST_FILE
> $MISSING_SINGLE_FILE > $MISSING_SINGLE_FILE
for PKGBUILD in $BUILDLIST; do for PKGBUILD in ${BUILDLIST[*]}; do
if [[ ${PKGBUILD:(-4)} == ".sqf" ]]; then if [[ ${PKGBUILD:(-4)} == ".sqf" ]]; then
parse_queue $QUEUEDIR/$PKGBUILD parse_queue $QUEUEDIR/$PKGBUILD
continue continue
@ -4735,7 +4736,7 @@ else
fi fi
if [[ -n $SEARCH ]]; then if [[ -n $SEARCH ]]; then
search_and_display "$SEARCH" search_and_display "${SEARCH[*]}"
fi fi
if [[ $UPDATE ]]; then if [[ $UPDATE ]]; then
@ -4745,7 +4746,7 @@ else
if [[ -n $GENSEARCH ]]; then if [[ -n $GENSEARCH ]]; then
check_if_repo_exists check_if_repo_exists
set -f set -f
for PKGSEARCH in $GENSEARCH; do for PKGSEARCH in ${GENSEARCH[*]}; do
echo "Searching for $PKGSEARCH" echo "Searching for $PKGSEARCH"
gen_search_package $PKGSEARCH gen_search_package $PKGSEARCH
done done