SliTaz Repositories

     1.1 --- a/mirror/root/dir-generator.php	Sun Feb 16 20:44:30 2014 +0100
     1.2 +++ b/mirror/root/dir-generator.php	Mon Feb 17 14:29:16 2014 +0000
     1.3 @@ -356,6 +356,8 @@
     1.4  		if ($item == ".folderlist") continue;
     1.5  		if ($item == ".filelist") continue;
     1.6  		if ($item == "dir-generator.php") continue;
     1.7 +		if ($item == "robots.txt") continue;
     1.8 +		if ($item == "humans.txt") continue;
     1.9  		if(is_dir($path.'/'.$item) and $item != '.' and $item != '..') {
    1.10  			$folderlist[] = array(
    1.11  				'name' => $item, 

     2.1 --- a/pkgs/mirror-search.sh	Sun Feb 16 20:44:30 2014 +0100
     2.2 +++ b/pkgs/mirror-search.sh	Mon Feb 17 14:29:16 2014 +0000
     2.3 @@ -241,11 +241,11 @@
     2.4  {
     2.5  	local tmp=/tmp/files.list.$(basename ${1%/packages})
     2.6  	if [ ! -s $tmp -o $1/files.list.lzma -nt $tmp ]; then
     2.7 -		unlzma -c $1/files.list.lzma > $tmp.$$ && mv $tmp.$$ $tmp
     2.8 +		unlzma < $1/files.list.lzma > $tmp.$$ && mv $tmp.$$ $tmp
     2.9  	fi
    2.10  	case "$2" in
    2.11  	lines)	if [ ! -s $tmp.lines -o $tmp -nt $tmp.lines ]; then
    2.12 -			cat $tmp | wc -l > $tmp.lines.$$ &&
    2.13 +			wc -l < $tmp > $tmp.lines.$$ &&
    2.14  			mv $tmp.lines.$$ $tmp.lines
    2.15  		fi
    2.16  		cat $tmp.lines ;;	
    2.17 @@ -293,9 +293,12 @@
    2.18  	PACKAGE_URL="http://mirror.slitaz.org/packages/$SLITAZ_VERSION/$(cd /var/www/slitaz/mirror/packages/$SLITAZ_VERSION ; ls $PACKAGE-$VERSION*.tazpkg)"
    2.19  	busybox wget -s $PACKAGE_URL 2> /dev/null &&
    2.20  	PACKAGE_HREF="<a href=\"$PACKAGE_URL\">$PACKAGE</a>"
    2.21 -	COOKER=""
    2.22 -	[ "$SLITAZ_VERSION" == "cooking" ] && 
    2.23 -	COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>"
    2.24 +	case "$SLITAZ_VERSION" in
    2.25 +	cooking) COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    2.26 +	undigest) COOKER="<a href=\"http://cook.slitaz.org/undigest/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    2.27 +	backports) COOKER="<a href=\"http://cook.slitaz.org/backports/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    2.28 +	*)	COOKER="";;
    2.29 +	esac
    2.30  	cat << _EOT_
    2.31  $PACKAGE_HREF $(installed_size $PACKAGE): $SHORT_DESC \
    2.32  <a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER
    2.33 @@ -909,7 +912,7 @@
    2.34  _EOT_
    2.35  		done
    2.36  		equiv=$PACKAGES_REPOSITORY/packages.equiv
    2.37 -		vpkgs="$(cat $equiv | cut -d= -f1 | grep $SEARCH)"
    2.38 +		vpkgs="$(cut -d= -f1 < $equiv | grep $SEARCH)"
    2.39  		for vpkg in $vpkgs ; do
    2.40  			cat << _EOT_
    2.41  </pre>

     3.1 --- a/pkgs/search.sh	Sun Feb 16 20:44:30 2014 +0100
     3.2 +++ b/pkgs/search.sh	Mon Feb 17 14:29:16 2014 +0000
     3.3 @@ -11,6 +11,7 @@
     3.4  . /etc/slitaz/slitaz.conf
     3.5  . /usr/lib/slitaz/httphelper.sh
     3.6  echo -n "0" > $HOME/ifEven
     3.7 +[ -n "$MIRROR_URL" ] || MIRROR_URL="http://mirror.slitaz.org"
     3.8  
     3.9  # User preferred language
    3.10  # parameter $1 have priority; without parameter $1 - browser language only
    3.11 @@ -305,16 +306,18 @@
    3.12  	<td>$SHORT_DESC</td>
    3.13  _EOT_
    3.14  	else
    3.15 -		PACKAGE_HREF="<u>$PACKAGE</u>"
    3.16  		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$PACKAGE-$VERSION$EXTRA_VERSION.tazpkg"
    3.17 -		nslookup $(echo $MIRROR_URL | sed 's|http://||g') | grep -q 127.0.0.1 &&
    3.18 -		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$(cd /var/www/slitaz/mirror/packages/$SLITAZ_VERSION ; ls $PACKAGE-$VERSION*.tazpkg)"
    3.19 -		busybox wget -s $PACKAGE_URL 2> /dev/null &&
    3.20  		PACKAGE_HREF="<a href=\"$PACKAGE_URL\">$PACKAGE</a>"
    3.21 +		case "$SLITAZ_VERSION" in
    3.22 +		cooking) COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    3.23 +		undigest) COOKER="<a href=\"http://cook.slitaz.org/undigest/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    3.24 +		backports) COOKER="<a href=\"http://cook.slitaz.org/backports/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    3.25 +		*)      COOKER="";;
    3.26 +		esac
    3.27  		cat << _EOT_
    3.28  	<td class="first">$PACKAGE_HREF</td>
    3.29  	<td class="first">$(installed_size $PACKAGE)</td>
    3.30 -	<td>$SHORT_DESC</td>
    3.31 +	<td>$SHORT_DESC <a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER</td>
    3.32  _EOT_
    3.33  	fi
    3.34  	cat << EOT
    3.35 @@ -328,14 +331,17 @@
    3.36  <a href="$SLITAZ_VERSION/$CATEGORY.html#$PACKAGE">$PACKAGE</a> $(installed_size $PACKAGE) : $SHORT_DESC
    3.37  _EOT_
    3.38  	else
    3.39 -		PACKAGE_HREF="<u>$PACKAGE</u>"
    3.40  		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$PACKAGE-$VERSION$EXTRA_VERSION.tazpkg"
    3.41 -		nslookup $(echo $MIRROR_URL | sed 's|http://||g') | grep -q 127.0.0.1 &&
    3.42 -		PACKAGE_URL="$MIRROR_URL/packages/$SLITAZ_VERSION/$(cd /var/www/slitaz/mirror/packages/$SLITAZ_VERSION ; ls $PACKAGE-$VERSION*.tazpkg)"
    3.43 -		busybox wget -s $PACKAGE_URL 2> /dev/null &&
    3.44  		PACKAGE_HREF="<a href=\"$PACKAGE_URL\">$PACKAGE</a>"
    3.45 +		case "$SLITAZ_VERSION" in
    3.46 +		cooking) COOKER="<a href=\"http://cook.slitaz.org/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    3.47 +		undigest) COOKER="<a href=\"http://cook.slitaz.org/undigest/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    3.48 +		backports) COOKER="<a href=\"http://cook.slitaz.org/backports/cooker.cgi?pkg=$PACKAGE\">$(gettext "Cooker")</a>";;
    3.49 +		*)      COOKER="";;
    3.50 +		esac
    3.51  		cat << _EOT_
    3.52 -$PACKAGE_HREF $(installed_size $PACKAGE) : $SHORT_DESC
    3.53 +$PACKAGE_HREF $(installed_size $PACKAGE) : $SHORT_DESC \
    3.54 +<a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER
    3.55  _EOT_
    3.56  	fi
    3.57  }