SliTaz Repositories

     1.1 --- a/tazpanel/pkgs.cgi	Wed Dec 24 02:51:01 2014 +0200
     1.2 +++ b/tazpanel/pkgs.cgi	Wed Dec 24 03:53:37 2014 +0200
     1.3 @@ -11,6 +11,10 @@
     1.4  
     1.5  . /lib/libtaz.sh
     1.6  . lib/libtazpanel
     1.7 +
     1.8 +. /etc/slitaz/slitaz.conf
     1.9 +. /etc/slitaz/tazpkg.conf
    1.10 +
    1.11  get_config
    1.12  header
    1.13  
    1.14 @@ -20,7 +24,6 @@
    1.15  xhtml_header | sed 's/id="content"/id="content-sidebar"/'
    1.16  
    1.17  export TEXTDOMAIN='tazpkg'
    1.18 -PKGS_DB="$LOCALSTATE"
    1.19  
    1.20  pkg_info_link()
    1.21  {
    1.22 @@ -67,7 +70,7 @@
    1.23  parse_packages_info() {
    1.24  	IFS=$'\t'
    1.25  	while read PACKAGE VERSION CATEGORY SHORT_DESC WEB_SITE TAGS SIZES DEPENDS; do
    1.26 -		class=pkg; [ -d $INSTALLED/${PACKAGE% } ] && class=pkgi
    1.27 +		class=pkg; grep -q "^$PACKAGE$'\t'" $PKGS_DB/installed.info && class=pkgi
    1.28  		i18n_desc $PACKAGE
    1.29  		cat << EOT
    1.30  <tr>
    1.31 @@ -177,8 +180,8 @@
    1.32  # ENTER will search but user may search for a button, so put one.
    1.33  
    1.34  search_form() {
    1.35 -	[ -n "$repo" ] || repo="$(GET repo)"
    1.36 -	[ -n "$repo" ] || repo=Any
    1.37 +	[ -z "$repo" ] && repo="$(GET repo)"
    1.38 +	[ -z "$repo" ] && repo="Any"
    1.39  	cat << EOT
    1.40  <div class="search">
    1.41  	<form method="get" action="$SCRIPT_NAME">
    1.42 @@ -416,7 +419,7 @@
    1.43  		cd $PKGS_DB
    1.44  		repo=$(GET repo)
    1.45  		category=$(GET cat)
    1.46 -		[ "$category" == "cat" ] && category="base-system"
    1.47 +		[ -z "$category" ] && category="base-system"
    1.48  		search_form
    1.49  		sidebar | sed "s/active_$category/active/;s/repo_$repo/active/"
    1.50  		LOADING_MSG="$(_ 'Listing packages...')"
    1.51 @@ -462,22 +465,6 @@
    1.52  						fi
    1.53  					done | parse_packages_info
    1.54  					;;
    1.55 -				all)
    1.56 -					make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' '
    1.57 -{
    1.58 -	if (PKG && PKG != $1) {
    1.59 -		if (DSCL) DSC = DSCL
    1.60 -		printf "<tr><td><input type=\"checkbox\" name=\"pkg\" value=\"%s\"><a class=\"pkg%s%s\" href=\"?info=%s\">%s</a></td><td>%s</td><td>%s</td><td><a href=\"%s\"></a></td></tr>\n", PKG, INS, BLK, gensub(/\+/, "%2B", "g", PKG), PKG, VER, DSC, WEB
    1.61 -		VER = DSC = WEB = DSCL = INS = BLK = ""
    1.62 -	}
    1.63 -
    1.64 -	PKG = $1
    1.65 -	if (NF == 1)   { BLK = "b"; next }
    1.66 -	if (NF == 2)   { DSCL = $2; next }
    1.67 -	if ($9 == "i") { PKG = $1; VER = $2; DSC = $4; WEB = $5; INS = "i"; next}
    1.68 -	if (! INS)     { PKG = $1; VER = $2; DSC = $4; WEB = $5 }
    1.69 -}'
    1.70 -					;;
    1.71  				*)
    1.72  					make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' -vc="$category" '
    1.73  {
    1.74 @@ -492,7 +479,7 @@
    1.75  	PKG = $1
    1.76  	if (NF == 1) { BLK = "b"; next }
    1.77  	if (NF == 2) { DSCL = $2; next }
    1.78 -	if ($3 == c) {
    1.79 +	if (c == "all" || $3 == c) {
    1.80  		CAT = c
    1.81  		if ($9 == "i") { PKG = $1; VER = $2; DSC = $4; WEB = $5; INS = "i"; next}
    1.82  		if (! INS)     { PKG = $1; VER = $2; DSC = $4; WEB = $5 }
    1.83 @@ -513,7 +500,7 @@
    1.84  		# Search for packages. Here default is to search in packages.desc
    1.85  		# and so get result including packages names and descriptions
    1.86  		#
    1.87 -		pkg=$(GET search)
    1.88 +		pkg=$(GET search); [ -z "$pkg" ] && xhtml_footer && exit
    1.89  		repo=$(GET repo)
    1.90  		cd $PKGS_DB
    1.91  		search_form
    1.92 @@ -538,7 +525,7 @@
    1.93  </div>
    1.94  	<input type="hidden" name="repo" value="$repo" />
    1.95  EOT
    1.96 -		if [ "$(GET files)" ]; then
    1.97 +		if [ -n "$(GET files)" ]; then
    1.98  			cat <<EOT
    1.99  	<table class="zebra outbox filelist">
   1.100  	<thead>
   1.101 @@ -825,7 +812,7 @@
   1.102  		cmd=$(GET admin)
   1.103  		case "$cmd" in
   1.104  			clean)
   1.105 -				rm -rf /var/cache/tazpkg/* ;;
   1.106 +				rm -rf $CACHE_DIR/* ;;
   1.107  			add-mirror)
   1.108  				# Decode url
   1.109  				mirror=$(GET mirror)
   1.110 @@ -858,8 +845,8 @@
   1.111  		[ "$cmd" == "$(_n 'Set link')" ] &&
   1.112  			[ -d "$(GET link)/$INSTALLED" ] && ln -fs $(GET link) $PKGS_DB/fslink
   1.113  		[ "$cmd" == "$(_n 'Remove link')" ] && rm -f $PKGS_DB/fslink
   1.114 -		cache_files=$(find /var/cache/tazpkg -name *.tazpkg | wc -l)
   1.115 -		cache_size=$(du -sh /var/cache/tazpkg | cut -f1 | sed 's|\.0||')
   1.116 +		cache_files=$(find $CACHE_DIR -name *.tazpkg | wc -l)
   1.117 +		cache_size=$(du -sh $CACHE_DIR | cut -f1 | sed 's|\.0||')
   1.118  		sidebar
   1.119  		cat << EOT
   1.120  <h2>$(_ 'Administration')</h2>
   1.121 @@ -922,7 +909,7 @@
   1.122  
   1.123  <h3>$(_ 'Default mirror')</h3>
   1.124  
   1.125 -<pre>$(cat /var/lib/tazpkg/mirror)</pre>
   1.126 +<pre>$(cat $PKGS_DB/mirror)</pre>
   1.127  
   1.128  <h3>$(_ 'Current mirror list')</h3>
   1.129  EOT
   1.130 @@ -1060,8 +1047,7 @@
   1.131  <h3>$(_ 'Latest log entries')</h3>
   1.132  
   1.133  <pre>
   1.134 -$(tail -n 5 /var/log/slitaz/tazpkg.log | fgrep "-" | \
   1.135 -	awk '{print $1, $2, $3, $4, $5, $6, $7}')
   1.136 +$(tail -n 5 $LOG | fgrep "-" | awk '{print $1, $2, $3, $4, $5, $6, $7}')
   1.137  </pre>
   1.138  EOT
   1.139  		;;