# HG changeset patch # User Christophe Lincoln # Date 1392572540 -3600 # Node ID e8e59366a3065fb2dc5b5591cb0b7e8372b0ad69 # Parent 3927a22b609e448cf19f5ea6e7afd9dadb4c6081 pkgs: fix paths to wok and dont show files nb (too long to load and not realy usefull) diff -r 3927a22b609e -r e8e59366a306 pkgs/lib/footer.sh --- a/pkgs/lib/footer.sh Sun Feb 16 18:20:41 2014 +0100 +++ b/pkgs/lib/footer.sh Sun Feb 16 18:42:20 2014 +0100 @@ -2,7 +2,7 @@
$(eval_ngettext "\$PKGS package" "\$PKGS packages" $PKGS) -$(eval_ngettext "and \$FILES file in \$SLITAZ_VERSION database" "and \$FILES files in \$SLITAZ_VERSION database" $FILES) +$(eval_ngettext "in \$SLITAZ_VERSION database")
diff -r 3927a22b609e -r e8e59366a306 pkgs/search.sh --- a/pkgs/search.sh Sun Feb 16 18:20:41 2014 +0100 +++ b/pkgs/search.sh Sun Feb 16 18:42:20 2014 +0100 @@ -184,12 +184,16 @@ # unescape query SEARCH="$(echo $SEARCH | sed 's/%2B/+/g; s/%3A/:/g; s|%2F|/|g')" - -WOK=$SLITAZ_HOME/$SLITAZ_VERSION/wok -PACKAGES_REPOSITORY=$SLITAZ_HOME/$SLITAZ_VERSION/packages -filelist=$PACKAGES_REPOSITORY/files.list.lzma -pkglist=$PACKAGES_REPOSITORY/packages.txt -equiv=$PACKAGES_REPOSITORY/packages.equiv +SLITAZ_HOME="" +if [ "$SLITAZ_VERSION" == "cooking" ]; then + WOK=$SLITAZ_HOME/wok +else + WOK=$SLITAZ_HOME/wok-${VERSION} +fi +pkgsrepo=$SLITAZ_HOME/$SLITAZ_VERSION/packages +filelist=$pkgsrepo/files.list.lzma +pkglist=$pkgsrepo/packages.txt +equiv=$pkgsrepo/packages.equiv # Search form # TODO: add hint 'You are can search for depends loop, if textfield is empty'... @@ -263,7 +267,7 @@ # TODO: caching the summary for 5 minutes xhtml_footer() { PKGS=$(ls $WOK/ | wc -l) - FILES=$(unlzma -c $filelist | wc -l) + #FILES=$(unlzma -c $filelist | wc -l) . lib/footer.sh } @@ -809,7 +813,7 @@ _EOT_ unset last - grep -i "$SEARCH" $PACKAGES_REPOSITORY/packages.desc | \ + grep -i "$SEARCH" $pkgsrepo/packages.desc | \ sort | while read pkg extras ; do . $WOK/$pkg/receipt package_entry @@ -938,7 +942,7 @@ for pkg in `ls $WOK/ | grep "$SEARCH"` do . $WOK/$pkg/receipt - DESC=" $(gettext description)" + DESC="

$(gettext description)

" [ -f $WOK/$pkg/description.txt ] || unset DESC cat << _EOT_ $(package_entry)$DESC