diff options
| author | Willy Tarreau <w@1wt.eu> | 2006-07-16 14:53:18 +0200 |
|---|---|---|
| committer | Willy Tarreau <willy@wtap.(none)> | 2006-07-26 10:49:02 +0200 |
| commit | e5312cb6d1399100999bde420cdda1ec1740f8fc (patch) | |
| tree | 517d96af08dbc087ac4a74f80805fc2f6e522596 /scripts/flxsearch | |
| parent | [RELEASE] flxutils-0.1.10.1 (diff) | |
| download | flxutils-e5312cb6d1399100999bde420cdda1ec1740f8fc.tar.xz | |
[RELEASE] flxutils-0.1.11v0.1.11
Diffstat (limited to 'scripts/flxsearch')
| -rwxr-xr-x | scripts/flxsearch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/flxsearch b/scripts/flxsearch index 1820020..44eac13 100755 --- a/scripts/flxsearch +++ b/scripts/flxsearch @@ -112,7 +112,7 @@ function main { packages="" fi fi - if [ "$packages" ] ; then # des packages potenties de source ont été donnés + if [ "$packages" ] ; then # des packages potentiels de source ont été donnés echo -n \# >&2 REPLY="" elif [ $SILENT = 0 -a ${#sources[*]} = 0 ] ; then # le fichier n'a été trouvé dans aucun package @@ -132,7 +132,7 @@ function main { fi if [ "$REPLY" ] ; then pkgname=$( basename $REPLY .lst ) - matchlist=$pkgname,${pkgname%-*},${pkgname%-*-*},${pkgname%%-*} + matchlist=$pkgname,${pkgname%-*},${pkgname%-*-*},${pkgname%%[._-][0-9]*} echo $file $matchlist >> $TMPDIR/OUTPUT else echo $file $packages >> $TMPDIR/OUTPUT @@ -140,10 +140,6 @@ function main { done < $LFILES } -# repertoire contenant les .lst et les .tgz servant de source -SEARCHPATH=$PKGROOT -SEARCHPATH=${SEARCHPATH:-.} - # temporary file and directory TMP=$(date +%y%m%d)-$RANDOM while [ -e /tmp/pg-$TMP ] ; do TMP=$(date +%y%m%d)-$RANDOM ; done @@ -212,6 +208,10 @@ while [ $# -gt 0 ] ; do shift done +# repertoire contenant les .lst et les .tgz servant de source +SEARCHPATH=${SEARCHPATH:-${PKGROOT:+$PKGROOT/.}} +SEARCHPATH=${SEARCHPATH:-.} + if [ $PRINTUSAGE -gt 0 ]; then # affiche les lignes du case ci-dessus echo "Usage : $0 followed by these parameters :" |