SliTaz Repositories

     1.1 --- a/pkgs/search.sh	Mon Feb 17 14:29:16 2014 +0000
     1.2 +++ b/pkgs/search.sh	Mon Feb 17 14:55:17 2014 +0000
     1.3 @@ -148,6 +148,7 @@
     1.4  		version=[1-9]*)			i=${i%%.*}; SLITAZ_VERSION=${i#*=}.0;;
     1.5  		version=s*|version=4*)	SLITAZ_VERSION=stable;;
     1.6  		version=u*)				SLITAZ_VERSION=undigest;;
     1.7 +		version=b*)				SLITAZ_VERSION=backports;;
     1.8  		version=t*)				SLITAZ_VERSION=tiny;;
     1.9  	esac
    1.10  done
    1.11 @@ -181,6 +182,7 @@
    1.12  	3.0)		selected_3="selected";;
    1.13  	stable)		selected_stable="selected";;
    1.14  	undigest)	selected_undigest="selected";;
    1.15 +	backports)	selected_backports="selected";;
    1.16  esac
    1.17  
    1.18  #
    1.19 @@ -235,6 +237,7 @@
    1.20  			<option $selected_1 value="1.0">1.0</option>
    1.21  			<option $selected_tiny value="tiny">$(gettext "tiny")</option>
    1.22  			<option $selected_undigest value="undigest">$(gettext "undigest")</option>
    1.23 +			<option $selected_backports value="backports">$(gettext "backports")</option>
    1.24  		</select>
    1.25  	</span>
    1.26  	<span class="small">
    1.27 @@ -254,11 +257,11 @@
    1.28  {
    1.29  	local tmp=/tmp/files.list.$(basename ${1%/packages})
    1.30  	if [ ! -s $tmp -o $1/files.list.lzma -nt $tmp ]; then
    1.31 -		unlzma -c $1/files.list.lzma > $tmp.$$ && mv $tmp.$$ $tmp
    1.32 +		unlzma < $1/files.list.lzma > $tmp.$$ && mv $tmp.$$ $tmp
    1.33  	fi
    1.34  	case "$2" in
    1.35  	lines)	if [ ! -s $tmp.lines -o $tmp -nt $tmp.lines ]; then
    1.36 -			cat $tmp | wc -l > $tmp.lines.$$ &&
    1.37 +			wc -l < $tmp > $tmp.lines.$$ &&
    1.38  			mv $tmp.lines.$$ $tmp.lines
    1.39  		fi
    1.40  		cat $tmp.lines ;;	
    1.41 @@ -270,7 +273,7 @@
    1.42  # TODO: caching the summary for 5 minutes
    1.43  xhtml_footer() {
    1.44  	PKGS=$(ls $WOK/ | wc -l)
    1.45 -	#FILES=$(unlzma -c $filelist | wc -l)
    1.46 +	#FILES=$(unlzma < $filelist | wc -l)
    1.47  	. lib/footer.sh
    1.48  }
    1.49  
    1.50 @@ -317,7 +320,8 @@
    1.51  		cat << _EOT_
    1.52  	<td class="first">$PACKAGE_HREF</td>
    1.53  	<td class="first">$(installed_size $PACKAGE)</td>
    1.54 -	<td>$SHORT_DESC <a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER</td>
    1.55 +	<td>$SHORT_DESC</td>
    1.56 +	<td><a href="?receipt=$PACKAGE&amp;version=$SLITAZ_VERSION">$(gettext "Receipt")</a> $COOKER</td>
    1.57  _EOT_
    1.58  	fi
    1.59  	cat << EOT
    1.60 @@ -492,7 +496,7 @@
    1.61  # Syntax highlighting for receipt file - stolen from tazpanel:
    1.62  # '/var/www/tazpanel/lib/libtazpanel' and developed
    1.63  syntax_highlighter() {
    1.64 -	cat "$1" | sed -e "s|\&|\&amp;|g; s|<|\&lt;|g; s|>|\&gt;|g; s|	|    |g" \
    1.65 +	sed -e "s|\&|\&amp;|g; s|<|\&lt;|g; s|>|\&gt;|g; s|	|    |g" \
    1.66  			-e "s|@|\&#64;|g; s|~|\&#126;|g" \
    1.67  	-e "#literals" \
    1.68  			-e "s|'\([^']*\)'|@l\0~|g" \
    1.69 @@ -539,7 +543,7 @@
    1.70  			-e "s|@s|<span class='r-scom'>|g" \
    1.71  			-e "s|@p|<span class='r-path'>|g" \
    1.72  			-e "s|@r|<span class='r-param'>|g" \
    1.73 -			-e "s|~|</span>|g"
    1.74 +			-e "s|~|</span>|g" < "$1"
    1.75  }
    1.76  
    1.77  
    1.78 @@ -721,8 +725,8 @@
    1.79  <h3>$(eval_gettext "These packages may overload files of \$SEARCH")</h3>
    1.80  <pre>
    1.81  _EOT_
    1.82 -		( unlzma -c $filelist | grep ^$SEARCH: ;
    1.83 -		  unlzma -c $filelist | grep -v ^$SEARCH: ) | awk '
    1.84 +		( unlzma < $filelist | grep ^$SEARCH: ;
    1.85 +		  unlzma < $filelist | grep -v ^$SEARCH: ) | awk '
    1.86  BEGIN { pkg=""; last="x" }
    1.87  {
    1.88  	if ($2 == "") next
    1.89 @@ -750,7 +754,7 @@
    1.90  <table>
    1.91  _EOT_
    1.92  		unset last
    1.93 -		unlzma -c $filelist \
    1.94 +		unlzma < $filelist \
    1.95  		| grep "$SEARCH" | while read pkg file; do
    1.96  			echo "$file" | grep -q "$SEARCH" || continue
    1.97  			if [ "$last" != "${pkg%:}" ]; then
    1.98 @@ -787,13 +791,13 @@
    1.99  <pre>
   1.100  _EOT_
   1.101  		unset last
   1.102 -		unlzma -c $filelist \
   1.103 +		unlzma < $filelist \
   1.104  		| grep ^$SEARCH: | sed 's/.*: /    /' | sort
   1.105  		cat << _EOT_
   1.106  </pre>
   1.107  <pre>
   1.108  _EOT_
   1.109 -		filenb=$(unlzma -c $filelist | grep ^$SEARCH: | wc -l)
   1.110 +		filenb=$(unlzma < $filelist | grep ^$SEARCH: | wc -l)
   1.111  		eval_ngettext "\$filenb file" "\$filenb files" $filenb
   1.112  		cat << _EOT_
   1.113    \
   1.114 @@ -956,7 +960,7 @@
   1.115  $(package_entry)$DESC
   1.116  _EOT_
   1.117  		done
   1.118 -		vpkgs="$(cat $equiv | cut -d= -f1 | grep $SEARCH)"
   1.119 +		vpkgs="$(cut -d= -f1 < $equiv | grep $SEARCH)"
   1.120  		for vpkg in $vpkgs ; do
   1.121  			cat << _EOT_
   1.122  </table>