spk rev 98

Tiny edits
author Paul Issott <paul@slitaz.org>
date Fri Jun 01 23:34:10 2012 +0100 (2012-06-01)
parents 7da09d0db03c
children 89cfb082a1b9
files README lib/libspk.sh spk spk-add spk-mirror spk-rm spk-up
line diff
     1.1 --- a/README	Tue May 29 18:09:54 2012 +0000
     1.2 +++ b/README	Fri Jun 01 23:34:10 2012 +0100
     1.3 @@ -61,7 +61,7 @@
     1.4  --------------------------------------------------------------------------------
     1.5  Here are the spk coding style notes, follow them if you want your code included
     1.6  in the package. These rules are in addition to cookutils coding style, please
     1.7 -also read cookutils/README
     1.8 +also read the cookutils/README
     1.9  
    1.10  
    1.11  	* No bash, be Busybox Ash compatible
     2.1 --- a/lib/libspk.sh	Tue May 29 18:09:54 2012 +0000
     2.2 +++ b/lib/libspk.sh	Fri Jun 01 23:34:10 2012 +0100
     2.3 @@ -143,7 +143,7 @@
     2.4  # Download a file trying all mirrors
     2.5  # Usage: file [url|path]
     2.6  #
     2.7 -# Priority to extra is done by mirrored_pkg wich try first to find the
     2.8 +# Priority to extra is done by mirrored_pkg which tries first to find the
     2.9  # packages in extra mirror, then on official.
    2.10  #
    2.11  download() {
    2.12 @@ -156,7 +156,7 @@
    2.13  	[ "$forced" ] && rm -f $pwd/$file
    2.14  	debug "download file: $file"
    2.15  	debug "DB: $db"
    2.16 -	# Local mirror ? End by cd to cache, we may be installind. If --get
    2.17 +	# Local mirror ? End by cd to cache we may be installed in. If --get
    2.18  	# was used we dl/copy in the current dir.
    2.19  	if [ -f "$uri/$file" ]; then
    2.20  		[ "$verbose" ] && echo "URI: $uri/"
    2.21 @@ -179,7 +179,7 @@
    2.22  		boldify " $file"
    2.23  		[ "$verbose" ] && (gettext "Destination:"; colorize 34 " $pwd")
    2.24  		if [ -f "$pwd/$file" ]; then
    2.25 -			echo "File exist: $pwd/$file" && return 0
    2.26 +			echo "File exists: $pwd/$file" && return 0
    2.27  		fi
    2.28  		# TODO: be a spider with wget -s to check if package is on mirror,
    2.29  		# if not try all official mirrors ?
    2.30 @@ -313,7 +313,7 @@
    2.31  	[ "$(dd if=$1 bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ]
    2.32  }
    2.33  
    2.34 -# Exec functions directly for developement purpose.
    2.35 +# Exec functions directly for developement purposes.
    2.36  case $1 in
    2.37  	*_*) func=$1 && shift && $func $@ ;;
    2.38  esac
     3.1 --- a/spk	Tue May 29 18:09:54 2012 +0000
     3.2 +++ b/spk	Fri Jun 01 23:34:10 2012 +0100
     3.3 @@ -144,7 +144,7 @@
     3.4  				count=$(($count + 1))
     3.5  				continue ;;
     3.6  			*\ --log\ *)
     3.7 -				# Display packges log's
     3.8 +				# Display package's log
     3.9  				if [ -f "$logdir/$pkg/install.log" ]; then
    3.10  					count=$(($count + 1))
    3.11  					[ "$count" == "1" ] && newline
     4.1 --- a/spk-add	Tue May 29 18:09:54 2012 +0000
     4.2 +++ b/spk-add	Fri Jun 01 23:34:10 2012 +0100
     4.3 @@ -24,7 +24,7 @@
     4.4  $(boldify $(gettext "Options:"))
     4.5    --forced    $(gettext "Force package reinstallation")
     4.6    --root=     $(gettext "Set the root file system path")
     4.7 -  --nodeps    $(gettext "Don't resolv packages dependencies")
     4.8 +  --nodeps    $(gettext "Don't resolve packages dependencies")
     4.9    --debug     $(gettext "Display some useful debug information")
    4.10  
    4.11  $(boldify $(gettext "Examples:"))
    4.12 @@ -321,7 +321,7 @@
    4.13  			package_full=$(echo $package_full | sed s/.tazpkg/$pkgarch/) ;;
    4.14  	esac
    4.15  
    4.16 -	# Let fetch the package by download()
    4.17 +	# Lets fetch the package by download()
    4.18  	[ "$count" == 1 ] && newline
    4.19  	debug "spk-add package: $package_name"
    4.20  	download "$package_full" $mirror
     5.1 --- a/spk-mirror	Tue May 29 18:09:54 2012 +0000
     5.2 +++ b/spk-mirror	Fri Jun 01 23:34:10 2012 +0100
     5.3 @@ -9,7 +9,7 @@
     5.4  . /usr/lib/slitaz/libspk.sh
     5.5  
     5.6  # NOTE: I want to use 'extra' mirrors since we can add any extra mirror
     5.7 -# URL's and not only undigest. See also undigest command - Pankso
     5.8 +# URLs and not only undigest. See also undigest command - Pankso
     5.9  
    5.10  #
    5.11  # Functions
    5.12 @@ -189,7 +189,7 @@
    5.13  			# Extra mirror
    5.14  			extra_db
    5.15  			if [ -d "$extradb/$db" ]; then
    5.16 -				gettext "Extra mirror already exist"; newline
    5.17 +				gettext "Extra mirror already exists"; newline
    5.18  				extra_info $db
    5.19  			else
    5.20  				boldify $(gettext "Enabling: extra mirror")
    5.21 @@ -230,7 +230,7 @@
    5.22  					mkdir -p $tmpdir
    5.23  					extract_receipt $tmpdir $pkg
    5.24  					extract_fileslist $tmpdir $pkg
    5.25 -					# We need ARCH set the get correct version.
    5.26 +					# We need ARCH set to get correct version.
    5.27  					ARCH=$(fgrep ARCH= /etc/slitaz/cook.conf | cut -d "\"" -f 2)
    5.28  					case "$ARCH" in
    5.29  						arm|x86_64) arch="-${ARCH}" ;;
     6.1 --- a/spk-rm	Tue May 29 18:09:54 2012 +0000
     6.2 +++ b/spk-rm	Fri Jun 01 23:34:10 2012 +0100
     6.3 @@ -34,7 +34,7 @@
     6.4  	exit 0
     6.5  }
     6.6  
     6.7 -# Avoid dirname errors by checking for argument anf then remove file and
     6.8 +# Avoid dirname errors by checking for argument and then remove file and
     6.9  # empty directory. Usage: remove_file file
    6.10  remove_file() {
    6.11  	[ "$1" ] || return
    6.12 @@ -118,7 +118,7 @@
    6.13  	# Do we have packages depending on $pkg to remove ?
    6.14  	if [ "$altered" ]; then
    6.15  		if [ "$confirm" ]; then
    6.16 -			gettext "Remove packages depending on:"; echo -n " $pkg"
    6.17 +			gettext "Removing packages depending on:"; echo -n " $pkg"
    6.18  			if ! confirm; then
    6.19  				gettext "Keeping packages..."; newline
    6.20  				newline && continue
     7.1 --- a/spk-up	Tue May 29 18:09:54 2012 +0000
     7.2 +++ b/spk-up	Fri Jun 01 23:34:10 2012 +0100
     7.3 @@ -22,8 +22,8 @@
     7.4  $(gettext "Update packages lists and upgrade the system")
     7.5  
     7.6  $(boldify $(gettext "Options:"))
     7.7 -  --list       $(gettext "Recharges the packages lists")
     7.8 -  --add        $(gettext "Install upgrade automaticaly")
     7.9 +  --list       $(gettext "Recharge the packages lists")
    7.10 +  --add        $(gettext "Install upgrades automatically")
    7.11    --forced     $(gettext "Force recharging the lists")
    7.12    --mirror=    $(gettext "Specify a mirror to check")
    7.13  
    7.14 @@ -35,7 +35,7 @@
    7.15  	exit 0
    7.16  }
    7.17  
    7.18 -# Headers fo system or packages update
    7.19 +# Headers for system or packages update
    7.20  up_headers() {
    7.21  	newline
    7.22  	boldify $(gettext "Package") \
    7.23 @@ -45,7 +45,7 @@
    7.24  	separator
    7.25  }
    7.26  
    7.27 -# Recharges all list from one mirror or all mirrors
    7.28 +# Recharges all lists from one mirror or all mirrors
    7.29  recharge_lists() {
    7.30  	newline
    7.31  	boldify $(gettext "Updating packages lists")
    7.32 @@ -104,7 +104,7 @@
    7.33  
    7.34  # Types: blocked, new build or new version
    7.35  up_type() {
    7.36 -	# Jump to next repository if pkg doesn't exists in this one.
    7.37 +	# Jump to next repository if pkg doesn't exist in this one.
    7.38  	grep -q "^$PACKAGE |" $dbdesc || continue
    7.39  
    7.40  	echo -n "$PACKAGE"
    7.41 @@ -154,7 +154,7 @@
    7.42  			$localdb) reponame=$(gettext "Local") ;;
    7.43  			*) reponame=$(gettext "Extra") ;;
    7.44  		esac
    7.45 -		# Overwrite: Local have priority
    7.46 +		# Overwrite: Local has priority
    7.47  		#if [ -d "$localdb" ] && fgrep -q "$sum  $PACKAGE-" $localdb/packages.$SUM; then
    7.48  			#reponame=$(gettext "Local")
    7.49  		#fi
    7.50 @@ -280,10 +280,10 @@
    7.51  		install_up
    7.52  	done
    7.53  	# List is generated each time and must be cleaned so
    7.54 -	# tazpkg-notify dont find upgrade anymore.
    7.55 +	# tazpkg-notify doesn't find upgrades anymore.
    7.56  	rm $pkgsup && touch $pkgsup
    7.57  	newline
    7.58 -	gettext "Handeled upgrades:"; colorize 32 " $upnb"
    7.59 +	gettext "Handled upgrades:"; colorize 32 " $upnb"
    7.60  	newline
    7.61  fi
    7.62