# HG changeset patch # User Paul Issott # Date 1338590050 -3600 # Node ID 0df5690de5fd57829b8403eb60bc74431aec2b80 # Parent 7da09d0db03c94510d65899ac674df7fbfb8756a Tiny edits diff -r 7da09d0db03c -r 0df5690de5fd README --- a/README Tue May 29 18:09:54 2012 +0000 +++ b/README Fri Jun 01 23:34:10 2012 +0100 @@ -61,7 +61,7 @@ -------------------------------------------------------------------------------- Here are the spk coding style notes, follow them if you want your code included in the package. These rules are in addition to cookutils coding style, please -also read cookutils/README +also read the cookutils/README * No bash, be Busybox Ash compatible diff -r 7da09d0db03c -r 0df5690de5fd lib/libspk.sh --- a/lib/libspk.sh Tue May 29 18:09:54 2012 +0000 +++ b/lib/libspk.sh Fri Jun 01 23:34:10 2012 +0100 @@ -143,7 +143,7 @@ # Download a file trying all mirrors # Usage: file [url|path] # -# Priority to extra is done by mirrored_pkg wich try first to find the +# Priority to extra is done by mirrored_pkg which tries first to find the # packages in extra mirror, then on official. # download() { @@ -156,7 +156,7 @@ [ "$forced" ] && rm -f $pwd/$file debug "download file: $file" debug "DB: $db" - # Local mirror ? End by cd to cache, we may be installind. If --get + # Local mirror ? End by cd to cache we may be installed in. If --get # was used we dl/copy in the current dir. if [ -f "$uri/$file" ]; then [ "$verbose" ] && echo "URI: $uri/" @@ -179,7 +179,7 @@ boldify " $file" [ "$verbose" ] && (gettext "Destination:"; colorize 34 " $pwd") if [ -f "$pwd/$file" ]; then - echo "File exist: $pwd/$file" && return 0 + echo "File exists: $pwd/$file" && return 0 fi # TODO: be a spider with wget -s to check if package is on mirror, # if not try all official mirrors ? @@ -313,7 +313,7 @@ [ "$(dd if=$1 bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ] } -# Exec functions directly for developement purpose. +# Exec functions directly for developement purposes. case $1 in *_*) func=$1 && shift && $func $@ ;; esac diff -r 7da09d0db03c -r 0df5690de5fd spk --- a/spk Tue May 29 18:09:54 2012 +0000 +++ b/spk Fri Jun 01 23:34:10 2012 +0100 @@ -144,7 +144,7 @@ count=$(($count + 1)) continue ;; *\ --log\ *) - # Display packges log's + # Display package's log if [ -f "$logdir/$pkg/install.log" ]; then count=$(($count + 1)) [ "$count" == "1" ] && newline diff -r 7da09d0db03c -r 0df5690de5fd spk-add --- a/spk-add Tue May 29 18:09:54 2012 +0000 +++ b/spk-add Fri Jun 01 23:34:10 2012 +0100 @@ -24,7 +24,7 @@ $(boldify $(gettext "Options:")) --forced $(gettext "Force package reinstallation") --root= $(gettext "Set the root file system path") - --nodeps $(gettext "Don't resolv packages dependencies") + --nodeps $(gettext "Don't resolve packages dependencies") --debug $(gettext "Display some useful debug information") $(boldify $(gettext "Examples:")) @@ -321,7 +321,7 @@ package_full=$(echo $package_full | sed s/.tazpkg/$pkgarch/) ;; esac - # Let fetch the package by download() + # Lets fetch the package by download() [ "$count" == 1 ] && newline debug "spk-add package: $package_name" download "$package_full" $mirror diff -r 7da09d0db03c -r 0df5690de5fd spk-mirror --- a/spk-mirror Tue May 29 18:09:54 2012 +0000 +++ b/spk-mirror Fri Jun 01 23:34:10 2012 +0100 @@ -9,7 +9,7 @@ . /usr/lib/slitaz/libspk.sh # NOTE: I want to use 'extra' mirrors since we can add any extra mirror -# URL's and not only undigest. See also undigest command - Pankso +# URLs and not only undigest. See also undigest command - Pankso # # Functions @@ -189,7 +189,7 @@ # Extra mirror extra_db if [ -d "$extradb/$db" ]; then - gettext "Extra mirror already exist"; newline + gettext "Extra mirror already exists"; newline extra_info $db else boldify $(gettext "Enabling: extra mirror") @@ -230,7 +230,7 @@ mkdir -p $tmpdir extract_receipt $tmpdir $pkg extract_fileslist $tmpdir $pkg - # We need ARCH set the get correct version. + # We need ARCH set to get correct version. ARCH=$(fgrep ARCH= /etc/slitaz/cook.conf | cut -d "\"" -f 2) case "$ARCH" in arm|x86_64) arch="-${ARCH}" ;; diff -r 7da09d0db03c -r 0df5690de5fd spk-rm --- a/spk-rm Tue May 29 18:09:54 2012 +0000 +++ b/spk-rm Fri Jun 01 23:34:10 2012 +0100 @@ -34,7 +34,7 @@ exit 0 } -# Avoid dirname errors by checking for argument anf then remove file and +# Avoid dirname errors by checking for argument and then remove file and # empty directory. Usage: remove_file file remove_file() { [ "$1" ] || return @@ -118,7 +118,7 @@ # Do we have packages depending on $pkg to remove ? if [ "$altered" ]; then if [ "$confirm" ]; then - gettext "Remove packages depending on:"; echo -n " $pkg" + gettext "Removing packages depending on:"; echo -n " $pkg" if ! confirm; then gettext "Keeping packages..."; newline newline && continue diff -r 7da09d0db03c -r 0df5690de5fd spk-up --- a/spk-up Tue May 29 18:09:54 2012 +0000 +++ b/spk-up Fri Jun 01 23:34:10 2012 +0100 @@ -22,8 +22,8 @@ $(gettext "Update packages lists and upgrade the system") $(boldify $(gettext "Options:")) - --list $(gettext "Recharges the packages lists") - --add $(gettext "Install upgrade automaticaly") + --list $(gettext "Recharge the packages lists") + --add $(gettext "Install upgrades automatically") --forced $(gettext "Force recharging the lists") --mirror= $(gettext "Specify a mirror to check") @@ -35,7 +35,7 @@ exit 0 } -# Headers fo system or packages update +# Headers for system or packages update up_headers() { newline boldify $(gettext "Package") \ @@ -45,7 +45,7 @@ separator } -# Recharges all list from one mirror or all mirrors +# Recharges all lists from one mirror or all mirrors recharge_lists() { newline boldify $(gettext "Updating packages lists") @@ -104,7 +104,7 @@ # Types: blocked, new build or new version up_type() { - # Jump to next repository if pkg doesn't exists in this one. + # Jump to next repository if pkg doesn't exist in this one. grep -q "^$PACKAGE |" $dbdesc || continue echo -n "$PACKAGE" @@ -154,7 +154,7 @@ $localdb) reponame=$(gettext "Local") ;; *) reponame=$(gettext "Extra") ;; esac - # Overwrite: Local have priority + # Overwrite: Local has priority #if [ -d "$localdb" ] && fgrep -q "$sum $PACKAGE-" $localdb/packages.$SUM; then #reponame=$(gettext "Local") #fi @@ -280,10 +280,10 @@ install_up done # List is generated each time and must be cleaned so - # tazpkg-notify dont find upgrade anymore. + # tazpkg-notify doesn't find upgrades anymore. rm $pkgsup && touch $pkgsup newline - gettext "Handeled upgrades:"; colorize 32 " $upnb" + gettext "Handled upgrades:"; colorize 32 " $upnb" newline fi