SliTaz Repositories

     1.1 --- a/spk-mirror	Fri May 18 19:23:52 2012 +0200
     1.2 +++ b/spk-mirror	Sat May 19 03:51:05 2012 -0500
     1.3 @@ -46,7 +46,7 @@
     1.4  		gettext "Checking file:"; echo -n " $file"
     1.5  		if ! wget -q -s -T 6 ${1}${list} 2>/dev/null; then
     1.6  			newline
     1.7 -			gettext "Unable to reach:"; colorize " $file" 31
     1.8 +			gettext "Unable to reach:"; colorize 31 " $file"
     1.9  			newline && return 1
    1.10  		fi
    1.11  		status
    1.12 @@ -67,7 +67,7 @@
    1.13  	nb=$(cat $extradb/$db/packages.$SUM 2>/dev/null | wc -l)
    1.14  	echo -n "Extra DB  :"; boldify " $db"
    1.15  	echo -n "Extra URL :"; echo " $(cat $extradb/$db/mirror)"
    1.16 -	gettext "Packages  :"; colorize " $nb" 32
    1.17 +	gettext "Packages  :"; colorize 32 " $nb"
    1.18  }
    1.19  
    1.20  # Add a package to packages.* lists
    1.21 @@ -119,13 +119,13 @@
    1.22  		boldify " $(cat $mirrorurl)"
    1.23  		if [ -f "$mirrors" ]; then
    1.24  			nb=$(cat $mirrors | wc -l)
    1.25 -			gettext "Mirrors  :"; colorize " $nb " $excolor
    1.26 +			gettext "Mirrors  :"; colorize $excolor " $nb "
    1.27  		fi
    1.28  		if [ -d "$extradb" ]; then
    1.29  			extra=$(ls $extradb | wc -l)
    1.30  		fi
    1.31  		[ "$extra" != 0 ] || excolor=31
    1.32 -		gettext "Extra    :"; colorize " $extra" $excolor
    1.33 +		gettext "Extra    :"; colorize $excolor " $extra"
    1.34  		separator
    1.35  		newline
    1.36  		if [ "$list" ]; then
    1.37 @@ -163,10 +163,10 @@
    1.38  				extra_db
    1.39  				if [ -d "$extradb/$db" ]; then
    1.40  					gettext "Removing extra mirror:"
    1.41 -					echo -n " $(boldify "$db")"
    1.42 +					echo -n " $(boldify $db)"
    1.43  					rm -rf $extradb/$db && status
    1.44  				else
    1.45 -					gettext "Not an extra mirror:"; colorize " $db" 31
    1.46 +					gettext "Not an extra mirror:"; colorize 31 " $db"
    1.47  				fi
    1.48  				newline && continue
    1.49  			fi
    1.50 @@ -180,7 +180,7 @@
    1.51  					i486) arch="/" ;;
    1.52  				esac
    1.53  				url=${url}packages/${SLITAZ_RELEASE}${arch}
    1.54 -				echo "URL: $(boldify "$url")"
    1.55 +				echo "URL: $(boldify $url)"
    1.56  				echo "$url" > $mirrorurl
    1.57  				newline && continue
    1.58  			fi
    1.59 @@ -192,7 +192,7 @@
    1.60  			else
    1.61  				boldify $(gettext "Enabling: extra mirror")
    1.62  				separator
    1.63 -				echo "URL: $(boldify "$url")"
    1.64 +				echo "URL: $(boldify $url)"
    1.65  				if ! check_mirror $url; then
    1.66  					continue
    1.67  				fi
    1.68 @@ -214,7 +214,7 @@
    1.69  			fi
    1.70  			newline
    1.71  			gettext "Directory:"; boldify " $pkgsdir"
    1.72 -			gettext "Packages :"; colorize " $nb" 32
    1.73 +			gettext "Packages :"; colorize 32 " $nb"
    1.74  			cd $pkgsdir
    1.75  			if [ ! "$nodb" ]; then
    1.76  				time=$(date +%s)
    1.77 @@ -247,7 +247,7 @@
    1.78  				time=$(($(date +%s) - $time))
    1.79  				echo -n "$nb "
    1.80  				gettext "packages added in"
    1.81 -				echo " ${time}s ($(date "+%Y%m%d %H:%M"))"
    1.82 +				echo " ${time}s ("$(date "+%Y%m%d %H:%M")")"
    1.83  			fi
    1.84  			newline
    1.85  			# Handle --extra: Use local repo as extra mirror with symlinks
    1.86 @@ -279,7 +279,7 @@
    1.87  				newline && continue
    1.88  			fi
    1.89  			gettext "Can't handle:"
    1.90 -			colorize " $url" 31 && newline ;;
    1.91 +			colorize 31 " $url"; newline ;;
    1.92  	esac
    1.93  done
    1.94