SliTaz Repositories

     1.1 --- a/spk-up	Thu May 24 17:02:36 2012 +0200
     1.2 +++ b/spk-up	Thu May 24 18:19:22 2012 +0200
     1.3 @@ -112,17 +112,6 @@
     1.4  	echo -n "$PACKAGE"
     1.5  	echo -n $(indent 28 "$VERSION")
     1.6  
     1.7 -	# Mirror name
     1.8 -	case $repo in
     1.9 -		$PKGS_DB) reponame=$(gettext "Official") ;;
    1.10 -		*) reponame=$(gettext "Extra") ;;
    1.11 -	esac
    1.12 -	# Local have priority
    1.13 -	if [ -d "$localdb" ] && $(grep -q "^$PACKAGE |" $extradb/local/packages.desc); then
    1.14 -		#local_count=$(($local_count + 1))
    1.15 -		reponame=$(gettext "Local")
    1.16 -	fi
    1.17 -
    1.18  	# Blocked
    1.19  	if $(grep -qs "^$PACKAGE" $blocked); then
    1.20  		blocked_count=$(($blocked_count + 1))
    1.21 @@ -147,18 +136,30 @@
    1.22  check_pkgup() {
    1.23  	unset_receipt
    1.24  	. $pkg/receipt
    1.25 +	localdb=$extradb/local
    1.26  	sum=$(fgrep "  $PACKAGE-${VERSION}$EXTRAVERSION.tazpkg" \
    1.27  		$installed.$SUM | awk '{print $1}')
    1.28  
    1.29  	# Skip up-to-date local packages
    1.30  	if [ -d "$extradb/local" ] && fgrep -q "$sum  $PACKAGE-" $extradb/local/packages.$SUM; then
    1.31 -		continue
    1.32 +		reponame=$(gettext "Local")
    1.33 +		return 0
    1.34  	fi
    1.35  
    1.36  	for repo in $(priority); do
    1.37  		dbdesc=$repo/packages.desc
    1.38  		dbsum=$repo/packages.$SUM
    1.39  
    1.40 +		# Mirror name
    1.41 +		case $repo in
    1.42 +			$PKGS_DB) reponame=$(gettext "Official") ;;
    1.43 +			*) reponame=$(gettext "Extra") ;;
    1.44 +		esac
    1.45 +		# Overwrite: Local have priority
    1.46 +		if [ -d "$extradb/local" ] && $(grep -q "^$PACKAGE |" $extradb/local/packages.desc); then
    1.47 +			reponame=$(gettext "Local")
    1.48 +		fi
    1.49 +
    1.50  		# Sum match or not ?
    1.51  		if ! fgrep -q "$sum  $PACKAGE-" $dbsum; then
    1.52  			up_type
    1.53 @@ -195,18 +196,17 @@
    1.54  			if [ -f "$installed/$pkg/receipt" ]; then
    1.55  				count=$(($count +1))
    1.56  				cd $installed
    1.57 +				. $pkg/receipt
    1.58  				check=$(check_pkgup)
    1.59  				if [ "$check" != "" ]; then
    1.60  					echo "$check"
    1.61  					[ "$add" ] && install_up
    1.62  				else
    1.63 -					if $(grep -qs "^${pkg}$" $blocked); then
    1.64 -						echo -n $(colorize 31 "$pkg $VERSION ")
    1.65 -						gettext "is blocked"; newline
    1.66 -					else
    1.67 -						echo -n $(boldify "$pkg $VERSION ")
    1.68 -						gettext "is up-to-date. Version"; newline
    1.69 -					fi
    1.70 +					echo -n "$pkg"
    1.71 +					echo -n $(indent 28 "$VERSION")
    1.72 +					echo -n $(colorize 32 $(indent 48 $(gettext "up-to-date")))
    1.73 +					check_pkgup
    1.74 +					indent 68 "$reponame"
    1.75  				fi
    1.76  			fi ;;
    1.77  	esac