# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1392647356 0
# Node ID f14e1d28ce93b80e3ba6e0f8515f7e34c86122c8
# Parent  44848aae0a052590af58baf87c61689c3ad2214a
pkgs: add cooker links

diff -r 44848aae0a05 -r f14e1d28ce93 mirror/root/dir-generator.php
--- a/mirror/root/dir-generator.php	Sun Feb 16 20:44:30 2014 +0100
+++ b/mirror/root/dir-generator.php	Mon Feb 17 14:29:16 2014 +0000
@@ -356,6 +356,8 @@
 		if ($item == ".folderlist") continue;
 		if ($item == ".filelist") continue;
 		if ($item == "dir-generator.php") continue;
+		if ($item == "robots.txt") continue;
+		if ($item == "humans.txt") continue;
 		if(is_dir($path.'/'.$item) and $item != '.' and $item != '..') {
 			$folderlist[] = array(
 				'name' => $item, 
diff -r 44848aae0a05 -r f14e1d28ce93 pkgs/mirror-search.sh
--- a/pkgs/mirror-search.sh	Sun Feb 16 20:44:30 2014 +0100
+++ b/pkgs/mirror-search.sh	Mon Feb 17 14:29:16 2014 +0000
@@ -241,11 +241,11 @@
 {
 	local tmp=/tmp/files.list.$(basename ${1%/packages})
 	if [ ! -s $tmp -o $1/files.list.lzma -nt $tmp ]; then
-		unlzma -c $1/files.list.lzma > $tmp.$$ && mv $tmp.$$ $tmp
+		unlzma < $1/files.list.lzma > $tmp.$$ && mv $tmp.$$ $tmp
 	fi
 	case "$2" in
 	lines)	if [ ! -s $tmp.lines -o $tmp -nt $tmp.lines ]; then
-			cat $tmp | wc -l > $tmp.lines.$$ &&
+			wc -l < $tmp > $tmp.lines.$$ &&
 			mv $tmp.lines.$$ $tmp.lines
 		fi
 		cat $tmp.lines ;;	
@@ -293,9 +293,12 @@
 	PACKAGE_URL="http://mirror.slitaz.org/packages/$SLITAZ_VERSION/$(cd /var/www/slitaz/mirror/packages/$SLITAZ_VERSION ; ls $PACKAGE-$VERSION*.tazpkg)"
 	busybox wget -s $PACKAGE_URL 2> /dev/null &&
 	PACKAGE_HREF="<a href=\"$PACKAGE_URL\">$PACKAGE</a>"
-	COOKER=""
-	[ "$SLITAZ_VERSION" == "cooking" ] && 
-	COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>"
+	case "$SLITAZ_VERSION" in
+	cooking) COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+	undigest) COOKER="<a href=\"http://cook.slitaz.org/undigest/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+	backports) COOKER="<a href=\"http://cook.slitaz.org/backports/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+	*)	COOKER="";;
+	esac
 	cat << _EOT_
 $PACKAGE_HREF $(installed_size $PACKAGE): $SHORT_DESC \
 <a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER
@@ -909,7 +912,7 @@
 _EOT_
 		done
 		equiv=$PACKAGES_REPOSITORY/packages.equiv
-		vpkgs="$(cat $equiv | cut -d= -f1 | grep $SEARCH)"
+		vpkgs="$(cut -d= -f1 < $equiv | grep $SEARCH)"
 		for vpkg in $vpkgs ; do
 			cat << _EOT_
 </pre>
diff -r 44848aae0a05 -r f14e1d28ce93 pkgs/search.sh
--- a/pkgs/search.sh	Sun Feb 16 20:44:30 2014 +0100
+++ b/pkgs/search.sh	Mon Feb 17 14:29:16 2014 +0000
@@ -11,6 +11,7 @@
 . /etc/slitaz/slitaz.conf
 . /usr/lib/slitaz/httphelper.sh
 echo -n "0" > $HOME/ifEven
+[ -n "$MIRROR_URL" ] || MIRROR_URL="http://mirror.slitaz.org"
 
 # User preferred language
 # parameter $1 have priority; without parameter $1 - browser language only
@@ -305,16 +306,18 @@
 	<td>$SHORT_DESC</td>
 _EOT_
 	else
-		PACKAGE_HREF="<u>$PACKAGE</u>"
 		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$PACKAGE-$VERSION$EXTRA_VERSION.tazpkg"
-		nslookup $(echo $MIRROR_URL | sed 's|http://||g') | grep -q 127.0.0.1 &&
-		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$(cd /var/www/slitaz/mirror/packages/$SLITAZ_VERSION ; ls $PACKAGE-$VERSION*.tazpkg)"
-		busybox wget -s $PACKAGE_URL 2> /dev/null &&
 		PACKAGE_HREF="<a href=\"$PACKAGE_URL\">$PACKAGE</a>"
+		case "$SLITAZ_VERSION" in
+		cooking) COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+		undigest) COOKER="<a href=\"http://cook.slitaz.org/undigest/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+		backports) COOKER="<a href=\"http://cook.slitaz.org/backports/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+		*)      COOKER="";;
+		esac
 		cat << _EOT_
 	<td class="first">$PACKAGE_HREF</td>
 	<td class="first">$(installed_size $PACKAGE)</td>
-	<td>$SHORT_DESC</td>
+	<td>$SHORT_DESC <a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER</td>
 _EOT_
 	fi
 	cat << EOT
@@ -328,14 +331,17 @@
 <a href="$SLITAZ_VERSION/$CATEGORY.html#$PACKAGE">$PACKAGE</a> $(installed_size $PACKAGE) : $SHORT_DESC
 _EOT_
 	else
-		PACKAGE_HREF="<u>$PACKAGE</u>"
 		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$PACKAGE-$VERSION$EXTRA_VERSION.tazpkg"
-		nslookup $(echo $MIRROR_URL | sed 's|http://||g') | grep -q 127.0.0.1 &&
-		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$(cd /var/www/slitaz/mirror/packages/$SLITAZ_VERSION ; ls $PACKAGE-$VERSION*.tazpkg)"
-		busybox wget -s $PACKAGE_URL 2> /dev/null &&
 		PACKAGE_HREF="<a href=\"$PACKAGE_URL\">$PACKAGE</a>"
+		case "$SLITAZ_VERSION" in
+		cooking) COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+		undigest) COOKER="<a href=\"http://cook.slitaz.org/undigest/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+		backports) COOKER="<a href=\"http://cook.slitaz.org/backports/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
+		*)      COOKER="";;
+		esac
 		cat << _EOT_
-$PACKAGE_HREF $(installed_size $PACKAGE) : $SHORT_DESC
+$PACKAGE_HREF $(installed_size $PACKAGE) : $SHORT_DESC \
+<a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER
 _EOT_
 	fi
 }