SliTaz Repositories

     1.1 --- a/tazpanel/pkgs	Wed Dec 31 17:08:23 2014 +0200
     1.2 +++ b/tazpanel/pkgs	Thu Jan 01 22:50:00 2015 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  cat <<EOT
     1.5  <li><a href="/pkgs.cgi">$(gettext 'Packages')</a>
     1.6  	<ul>
     1.7 -		<li><a href="/pkgs.cgi?list"><img
     1.8 +		<li><a href="/pkgs.cgi?cat=all&amp;my=my&amp;repo=Public"><img
     1.9  			src="/styles/default/images/tazpkg.png" />$(gettext 'My packages')</a></li>
    1.10  		<li><a href="/pkgs.cgi?recharge"><img
    1.11  			src="/styles/default/images/update.png" />$(gettext 'Recharge list')</a></li>

     2.1 --- a/tazpanel/pkgs.cgi	Wed Dec 31 17:08:23 2014 +0200
     2.2 +++ b/tazpanel/pkgs.cgi	Thu Jan 01 22:50:00 2015 +0200
     2.3 @@ -18,6 +18,12 @@
     2.4  get_config
     2.5  header
     2.6  
     2.7 +_()  { local T="$1"; shift; printf "$(gettext "$T")" "$@"; echo; }
     2.8 +_n() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; }
     2.9 +_p() {
    2.10 +	local S="$1" P="$2" N="$3"; shift; shift; shift;
    2.11 +	printf "$(ngettext "$S" "$P" "$N")" "$@"; }
    2.12 +
    2.13  
    2.14  # xHTML 5 header with special side bar for categories.
    2.15  TITLE=$(TEXTDOMAIN='tazpkg'; _ 'TazPanel - Packages')
    2.16 @@ -185,17 +191,17 @@
    2.17  
    2.18  
    2.19  sidebar() {
    2.20 -	[ -z "$repo" ] && repo='Public'
    2.21 -	my=$(GET my); cat=$(GET cat)
    2.22 -	row='<tr><td><input type="submit" name="cat" value="'
    2.23 +	repo=$(GET repo); repo=${repo:-Public}
    2.24 +	my=$(GET my); my=${my:-my}
    2.25 +	cat=$(GET cat); cat=${cat:-all}
    2.26  
    2.27  	cat << EOT
    2.28  <form method="get" action="">
    2.29  
    2.30  <div id="sidebar">
    2.31 -	<select id="my" name="my" onchange="this.form.submit()">
    2.32 +	<select id="my" name="my" value="$my" onchange="this.form.submit()">
    2.33  		<option value="my">$(_ 'My packages')</option>
    2.34 -		<option value=""  >$(_ 'All packages')</option>
    2.35 +		<option value="no">$(_ 'All packages')</option>
    2.36  	</select>
    2.37  
    2.38  	<h4>$(_ 'Categories')</h4>
    2.39 @@ -238,12 +244,13 @@
    2.40  		<option value="Any">$(_ 'Any')</option>
    2.41  	</select>
    2.42  	<script type="text/javascript">document.getElementById('repo').value="$repo"</script>
    2.43 -
    2.44 +EOT
    2.45 +	fi
    2.46 +	cat << EOT
    2.47  	<a href="?tag=&amp;my=$my&amp;repo=$repo">$(_ 'All tags...')</a>
    2.48  	<a href="?cat=&amp;my=$my&amp;repo=$repo">$(_ 'All categories...')</a>
    2.49 +</div>
    2.50  EOT
    2.51 -	fi
    2.52 -	echo "</div>"
    2.53  }
    2.54  
    2.55  
    2.56 @@ -337,7 +344,8 @@
    2.57  
    2.58  	pager="$(pager $cached)"
    2.59  	if [ "$pager" != "<p>$(_ 'Pages:') </p>" ]; then
    2.60 -		[ "$repo" != "Public" ] && echo "<h3>$(_ 'Repository: %s' $(repo_name $i))</h3>"
    2.61 +		[ -d $PKGS_DB/undigest ] && [ "$repo" != "Public" ] && \
    2.62 +			echo "<h3>$(_ 'Repository: %s' $(repo_name $i))</h3>"
    2.63  		echo "$pager"
    2.64  
    2.65  		table_head
    2.66 @@ -370,6 +378,8 @@
    2.67  
    2.68  
    2.69  case " $(GET) " in
    2.70 +
    2.71 +
    2.72  	*\ linkable\ *)
    2.73  		#
    2.74  		# List linkable packages.
    2.75 @@ -471,7 +481,7 @@
    2.76  </div>
    2.77  EOT
    2.78  			for i in $(repo_list ""); do
    2.79 -				show_list $my
    2.80 +				show_list ${my#no}
    2.81  			done
    2.82  			echo '</form>'
    2.83  		fi
    2.84 @@ -584,8 +594,10 @@
    2.85  		LOADING_MSG="$(_ 'Checking for upgrades...')"
    2.86  		loading_msg
    2.87  		cat << EOT
    2.88 +</form>
    2.89  <h2>$(_ 'Up packages')</h2>
    2.90  
    2.91 +<form method="get" action="">
    2.92  <div id="actions">
    2.93  	<div class="float-left">
    2.94  		$(_ 'Selection:')
    2.95 @@ -637,6 +649,7 @@
    2.96  		search_form
    2.97  		sidebar
    2.98  		loading_msg
    2.99 +		pkgs=$pkgs
   2.100  		cat << EOT
   2.101  <h2>TazPkg: $cmd</h2>
   2.102  
   2.103 @@ -646,7 +659,7 @@
   2.104  	</div>
   2.105  </div>
   2.106  <div class="box">
   2.107 -	$(_ 'Executing %s for: %s' $cmd $pkgs)
   2.108 +	$(_ 'Executing %s for: %s' $cmd "$pkgs")
   2.109  </div>
   2.110  EOT
   2.111  		for pkg in $pkgs; do
   2.112 @@ -1075,7 +1088,8 @@
   2.113  			params="&amp;my=$my&amp;repo=$repo" # don't forget it unexpectedly
   2.114  			echo "<h2>$(_ 'Tags list')</h2>"
   2.115  			echo "<p>"
   2.116 -			TAGS="$(awk -F$'\t' '{if($6){print $6}}' $PKGS_DB/packages.info | tr ' ' $'\n' | sort | uniq -c)"
   2.117 +			if [ ! -e $PKGS_DB/packages.info ]; then list=installed; else list=packages; fi
   2.118 +			TAGS="$(awk -F$'\t' '{if($6){print $6}}' $PKGS_DB/$list.info | tr ' ' $'\n' | sort | uniq -c)"
   2.119  			MAX="$(echo "$TAGS" | awk '{if ($1 > MAX) MAX = $1} END{print MAX}')"
   2.120  			echo "$TAGS" | awk -vMAX="$MAX" -vp="$params" '{
   2.121  				printf "<a class=\"tag%s\" href=\"?tag=%s%s\" title=\"%s\">%s</a> ", int($1 * 7 / MAX + 1), $2, p, $1, $2
   2.122 @@ -1110,11 +1124,16 @@
   2.123  <tbody>
   2.124  <tr><td>$(_ 'Last recharge:')</td><td>
   2.125  EOT
   2.126 -		ls -l $PKGS_DB/packages.list | awk '{print $6, $7, $8}'
   2.127 -		if [ -n "$(find $PKGS_DB/packages.list -mtime +10)" ]; then
   2.128 -			_ '(Older than 10 days)'
   2.129 +		recharged="$(ls -l $PKGS_DB/packages.list | awk '{print $6, $7, $8}')"
   2.130 +		if [ -z "$recharged" ]; then
   2.131 +			_ 'never'
   2.132  		else
   2.133 -			_ '(Not older than 10 days)'
   2.134 +			echo $recharged
   2.135 +			if [ -n "$(find $PKGS_DB/packages.list -mtime +10)" ]; then
   2.136 +				_ '(Older than 10 days)'
   2.137 +			else
   2.138 +				_ '(Not older than 10 days)'
   2.139 +			fi
   2.140  		fi
   2.141  		cat << EOT
   2.142  </td></tr>