SliTaz Repositories

     1.1 --- a/pkgs.cgi	Thu Apr 14 17:46:05 2011 +0200
     1.2 +++ b/pkgs.cgi	Thu Apr 14 17:48:18 2011 +0200
     1.3 @@ -179,10 +179,13 @@
     1.4  			echo '<tr>'
     1.5  			# Use default tazpkg icon since all packages displayed are
     1.6  			# installed
     1.7 +			colorpkg=$pkg
     1.8 +			grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list &&
     1.9 +				colorpkg="<span style='color: red;'>$pkg</span>"
    1.10  			echo "<td class='pkg'>
    1.11  				<input type='checkbox' name='pkg' value=\"$pkg\" />
    1.12  				<a href='$SCRIPT_NAME?info=$pkg'><img
    1.13 -					src='$IMAGES/tazpkg-installed.png'/>$pkg</a></td>"
    1.14 +					src='$IMAGES/tazpkg-installed.png'/>$colorpkg</a></td>"
    1.15  			echo "<td>$VERSION</td>"
    1.16  			echo "<td class='desc'>$SHORT_DESC</td>"
    1.17  			echo "<td><a href='$WEB_SITE'>web</a></td>"
    1.18 @@ -357,15 +360,15 @@
    1.19  		#
    1.20  		# Do an action on one or some packages
    1.21  		#
    1.22 +		opt=""
    1.23  		pkgs=""
    1.24  		cmdline=`echo ${QUERY_STRING#do=} | sed s'/&/ /g'`		
    1.25  		cmd=`echo ${cmdline} | awk '{print $1}'`		
    1.26  		pkgs=`echo $cmdline | sed -e s'/+/ /g' -e s'/pkg=//g' -e s/$cmd//`
    1.27 +		cmd=`echo $cmd | tr [A-Z] [a-z]`		
    1.28  		case $cmd in
    1.29 -			install|Install)
    1.30 +			install)
    1.31  				cmd=get-install opt=--forced ;;
    1.32 -			remove|Remove)
    1.33 -				cmd=remove ;;
    1.34  		esac
    1.35  		search_form
    1.36  		sidebar
    1.37 @@ -428,6 +431,19 @@
    1.38  	<div class="float-left">
    1.39  		<p>
    1.40  			<a class="button" href='$SCRIPT_NAME?do=$action&$pkg'>$action</a>
    1.41 +EOT
    1.42 +		if [ -d $INSTALLED/$pkg ]; then
    1.43 +			if grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list; then
    1.44 +				block=$(gettext "Unblock")
    1.45 +			else
    1.46 +				block=$(gettext "Block")
    1.47 +			fi
    1.48 +			cat << EOT
    1.49 +			<a class="button" href='$SCRIPT_NAME?do=$block&$pkg'>$block</a>
    1.50 +			<a class="button" href='$SCRIPT_NAME?do=Repack&$pkg'>Repack</a>
    1.51 +EOT
    1.52 +		fi
    1.53 +		cat << EOT
    1.54  		</p>
    1.55  	</div>
    1.56  	<div class="float-right">
    1.57 @@ -446,10 +462,25 @@
    1.58  		if [ -d $INSTALLED/$pkg ]; then
    1.59  			cat << EOT
    1.60  Maintainer  : $MAINTAINER
    1.61 -Depends     : `for i in $DEPENDS; do echo -n \
    1.62 -	"<a href="$SCRIPT_NAME?info=$i">$i</a> "; done`
    1.63  Website     : <a href="$WEB_SITE">$WEB_SITE</a>
    1.64  Sizes       : $PACKED_SIZE/$UNPACKED_SIZE
    1.65 +EOT
    1.66 +			if [ -n "$DEPENDS" ]; then
    1.67 +				echo -n "Depends     : "
    1.68 +				for i in $DEPENDS; do 
    1.69 +					echo -n "<a href="$SCRIPT_NAME?info=$i">$i</a> "
    1.70 +				done
    1.71 +				echo ""
    1.72 +			fi
    1.73 +			if [ -n "$SUGGESTED" ]; then
    1.74 +				echo -n "Suggested   : "
    1.75 +				for i in $SUGGESTED; do 
    1.76 +					echo -n "<a href="$SCRIPT_NAME?info=$i">$i</a> "
    1.77 +				done
    1.78 +				echo ""
    1.79 +			fi
    1.80 +			[ -n "$TAGS" ] && echo "Tags        : $TAGS"
    1.81 +			cat << EOT
    1.82  </pre>
    1.83  
    1.84  <p>`gettext "Installed files:"` `cat $INSTALLED/$pkg/files.list | wc -l`</p>
    1.85 @@ -528,6 +559,9 @@
    1.86  		#
    1.87  		search_form
    1.88  		sidebar
    1.89 +PAPY
    1.90 +		[ -n "$(GET block)" ] && tazpkg block $(GET block)
    1.91 +		[ -n "$(GET unblock)" ] && tazpkg unblock $(GET unblock)
    1.92  		cat << EOT
    1.93  <h2>`gettext "Summary"`</h2>
    1.94  <div id="actions">
    1.95 @@ -554,7 +588,7 @@
    1.96  <h3>`gettext "Administration"`</h3>
    1.97  <div id="actions">
    1.98  	<a class="button" href='$SCRIPT_NAME?action=saveconf#administration'>
    1.99 -		<img src="$IMAGES/tazpkg.png" />`gettext "Save configuration files"`</a>
   1.100 +		<img src="$IMAGES/tazpkg.png" />`gettext "Save configuration"`</a>
   1.101  	<a class="button" href='$SCRIPT_NAME?action=listconf#administration'>
   1.102  		<img src="$IMAGES/edit.png" />`gettext "List configuration files"`</a>
   1.103  	<a class="button" href='$SCRIPT_NAME?action=quickcheck#administration'>