# HG changeset patch # User Pascal Bellard # Date 1420805132 -3600 # Node ID d81d9cd03f7b0db94f829d9f3216dc51208b7669 # Parent 071c56593d84f14078bce459da2a433e821f25e2 cooker.cgi: allow wildcard in package search diff -r 071c56593d84 -r d81d9cd03f7b cook --- a/cook Thu Nov 27 16:38:10 2014 +0200 +++ b/cook Fri Jan 09 13:05:32 2015 +0100 @@ -310,7 +310,7 @@ *.zip|*.xpi) unzip -o $SRC/$TARBALL ;; *.xz) unxz -c $SRC/$TARBALL | tar xf - || tar xf $SRC/$TARBALL 2>/dev/null;; *.7z) 7zr x $SRC/$TARBALL ;; - *.Z) uncompress -c $SRC/$TARBALL | tar xf - ;; + *.Z|*.z) uncompress -c $SRC/$TARBALL | tar xf - ;; *.rpm) rpm2cpio $SRC/$TARBALL | cpio -idm --quiet ;; *.run) /bin/sh $SRC/$TARBALL $RUN_OPTS ;; *) cp $SRC/$TARBALL $(pwd) ;; diff -r 071c56593d84 -r d81d9cd03f7b web/cooker.cgi --- a/web/cooker.cgi Thu Nov 27 16:38:10 2014 +0200 +++ b/web/cooker.cgi Fri Jan 09 13:05:32 2015 +0100 @@ -179,7 +179,26 @@ echo "browse" fi else - echo "No package named: $pkg" + if [ $(ls $wok/*$pkg*/receipt 2> /dev/null | wc -l) -eq 0 ]; then + echo "No package named: $pkg" + else + ls $wok/$pkg/receipt >/dev/null 2>&1 || pkg="*$pkg*" + echo '' + for i in $(cd $wok ; ls $pkg/receipt); do + pkg=$(dirname $i) + unset SHORT_DESC CATEGORY + . $wok/$pkg/receipt + cat < + + + + +EOT + done + echo '
$pkg$SHORT_DESC$CATEGORY
' + unset pkg + fi fi echo '' @@ -207,7 +226,7 @@ cat $log | syntax_highlighter log echo '' else - echo "
No log: $pkg
" + [ "$pkg" ] && echo "
No log: $pkg
" fi ;; file=*) # Dont allow all files on the system for security reasons. @@ -277,9 +296,9 @@ fi ;; files=*) pkg=${QUERY_STRING#files=} - echo "

Installed files by: $pkg

" dir=$(ls -d $WOK/$pkg/taz/$pkg-*) if [ -d "$dir/fs" ]; then + echo "

Installed files by: $pkg ($(du -hs $dir/fs | awk '{ print $1 }'))

" echo '
'
 			find $dir/fs -not -type d | xargs ls -ld | \
 				sed "s|\(.*\) /.*\(${dir#*wok}/fs\)\(.*\)|\1 \3|;s|^\([^-].*\)\(\(.*\)|\1\3|"