tazwok rev 430
Tazwok: tiny edits
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Mon Mar 07 11:42:27 2011 +0000 (2011-03-07) |
| parents | ff2492afbf1a |
| children | 0105904d06fe |
| files | tazwok |
line diff
1.1 --- a/tazwok Mon Mar 07 08:02:53 2011 +0000 1.2 +++ b/tazwok Mon Mar 07 11:42:27 2011 +0000 1.3 @@ -44,7 +44,7 @@ 1.4 cook Compile and generate a package directly. 1.5 cook-list Cook all packages specified in the list by order. 1.6 cook-commit Cook all modified receipts. 1.7 - cook-all Cook all packages excepted toolchain. 1.8 + cook-all Cook all packages except toolchain. 1.9 cook-toolchain Cook the toolchain packages. 1.10 gen-cooklist Generate a sorted cooklist using packages or list. 1.11 sort-cooklist Sort the cooklist given in argument. 1.12 @@ -53,10 +53,10 @@ 1.13 new-tree Prepare a new package tree and receipt (--interactive). 1.14 gen-list (Re-)Generate a packages list for a repository. 1.15 check-list Update packages lists for a repository. 1.16 - gen-wok-db (Re-)Generate wok lists with depends and wanted datas. 1.17 + gen-wok-db (Re-)Generate wok lists with depends and wanted data. 1.18 gen-clean-wok Generate a clean wok in a dir. 1.19 clean-wok Clean entirely the wok. 1.20 - clean-src Remove old/unrelated-to-wok sources. 1.21 + clean-src Remove old/unrelated-to-wok sources. 1.22 remove Remove a package from the wok. 1.23 webserver Enable/disable webserver on localhost. 1.24 update-wok Update the wok. 1.25 @@ -66,12 +66,12 @@ 1.26 block Add package from the blocked list to prevent cooking it. 1.27 unblock Remove package from the blocked list.\n 1.28 1.29 - You can use `basename $0` command --help to list avaible options. 1.30 + You can use `basename $0` command --help to list available options. 1.31 \033[1mImportant - *: \033[0m Commands which need a rewrite." 1.32 } 1.33 1.34 -# This function display an error message without returning any error code. 1.35 -# It also log the message in source package's warnings.txt; this file can be 1.36 +# This function displays an error message without returning any error code. 1.37 +# It also logs the message in source package's warnings.txt; this file can be 1.38 # used on an eventual package page on website to display cooking warnings. 1.39 tazwok_warning() 1.40 { 1.41 @@ -114,7 +114,7 @@ 1.42 set_common_path 1.43 1.44 # /!\ This part needs some changes. 1.45 - # Basically, get theses files from the net if they are missing. 1.46 + # Basically, get these files from the net if they are missing. 1.47 dep_db=$INCOMING_REPOSITORY/wok-depends.txt 1.48 wan_db=$INCOMING_REPOSITORY/wok-wanted.txt 1.49 1.50 @@ -225,12 +225,12 @@ 1.51 mv "$src/_pkg" $WOK/$PACKAGE/install 1.52 fi 1.53 1.54 - # Don't remove sources if a package use src variable in his 1.55 + # Don't remove sources if a package uses src variable in its 1.56 # genpkg_rules: it maybe need something inside. 1.57 for i in $PACKAGE $(look_for_rwanted); do 1.58 sed -n '/^genpkg_rules\(\)/','/}/'p $WOK/$i/receipt | \ 1.59 fgrep -q '$src' && tazwok_warning "Sources will not be removed \ 1.60 -because $i use \$src in his receipt." && return 1.61 +because $i use \$src in its receipt." && return 1.62 done 1.63 1.64 report step "Removing sources directory" 1.65 @@ -239,7 +239,7 @@ 1.66 } 1.67 1.68 # Check $COOK_OPT; usage : get_cookopt particular_opt 1.69 -# Return error if not founded 1.70 +# Return error if not found 1.71 # Return args if the opt is in the format opt=arg1:arg2:etc 1.72 look_for_cookopt() 1.73 { 1.74 @@ -327,7 +327,7 @@ 1.75 # Don't cook if a depend is broken. 1.76 if [ "$broken" ]; then 1.77 MISSING_PACKAGE=$plan_remove 1.78 - echo "Can't cook $PACKAGE because broken depend(s) : $broken" >&2 1.79 + echo "Can't cook $PACKAGE because of broken depend(s) : $broken" >&2 1.80 unset plan_remove broken 1.81 1.82 # Set report step to failed. 1.83 @@ -374,7 +374,7 @@ 1.84 { 1.85 [ "$1" ] || return 1.86 report step "Removing previous build dependencies" 1.87 - echo "Removing theses packages : $@" 1.88 + echo "Removing these packages : $@" 1.89 for pkg in $@; do 1.90 [ -f "$INSTALLED/$pkg/receipt" ] && tazpkg remove $pkg --auto 1.91 done 1.92 @@ -383,7 +383,7 @@ 1.93 } 1.94 1.95 # Check if we can use the new way to handle tarball 1.96 -# or if we keep the previous method by check for 1.97 +# or if we keep the previous method by checking for 1.98 # _pkg=/src= in receipt and reverse-wanted. 1.99 check_for_var_modification() 1.100 { 1.101 @@ -403,7 +403,7 @@ 1.102 if check_for_var_modification src _pkg; then 1.103 src=$WOK/${WANTED:-$PACKAGE}/${WANTED:-$PACKAGE}-$VERSION 1.104 else 1.105 - tazwok_warning "Use original name or tarball root directory because src/_pkg are defined into the receipt (this is no more needed!)." 1.106 + tazwok_warning "Use original name or tarball root directory because src/_pkg is defined in the receipt (this is no longer needed!)." 1.107 src=$WOK/${WANTED:-$PACKAGE}/${SOURCE:-${WANTED:-$PACKAGE}}-$VERSION 1.108 fi 1.109 stuff=$WOK/$PACKAGE/stuff 1.110 @@ -488,7 +488,7 @@ 1.111 # Log process. 1.112 echo "untaring source tarball" >> $LOG 1.113 1.114 - # If $tmp_src exists, there's already the unpacked tarball into it. 1.115 + # If $tmp_src exists, there's already a unpacked tarball in it. 1.116 if ! [ -d $tmp_src ]; then 1.117 mkdir $tmp_src 1.118 if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$repack_src" = yes ]; then 1.119 @@ -530,7 +530,7 @@ 1.120 mv $tmp_src/* $WOK/$PACKAGE 1.121 repack_src=no 1.122 rm -r $tmp_src 1.123 - tazwok_warning "Put all files into $WOK/$PACKAGE; not sure about how to handle this tarball (no root dir)... Please try to remove src/_pkg definition from receipt if you encounter a problem." 1.124 + tazwok_warning "Putting all files in $WOK/$PACKAGE; not sure about how to handle this tarball (no root dir)... Please try to remove src/_pkg definition from the receipt if you encounter any problems." 1.125 fi 1.126 fi 1.127 fi 1.128 @@ -544,7 +544,7 @@ 1.129 fi 1.130 1.131 # Remove previous tarball if no other package needs it. We take care to 1.132 - # keep tarball if the same package use it into main repository. 1.133 + # keep tarball if the same package uses it in the main repository. 1.134 if [ "$TARBALL" ]; then 1.135 previous_tarball=$(grep ^$PACKAGE:incoming $SOURCES_REPOSITORY/sources.list | cut -f2) 1.136 if [ "$previous_tarball" ]; then 1.137 @@ -603,13 +603,13 @@ 1.138 # RAM are available. 1.139 if [ "$freeram" -lt 524288 ] && [ "$CFLAGS" != "${CFLAGS/-pipe}" -o \ 1.140 "$CXXFLAGS" != "${CXXFLAGS/-pipe}" ]; then 1.141 - tazwok_warning "Disabling -pipe compile flag because only ${freeram}b of RAM are available." 1.142 + tazwok_warning "Disabling -pipe compile flag because only ${freeram}b of RAM is available." 1.143 CFLAGS="${CFLAGS/-pipe}" 1.144 CXXFLAGS="${CXXFLAGS/-pipe}" 1.145 fi 1.146 unset freeram 1.147 1.148 - # Set cook environnement variables. 1.149 + # Set cook environement variables. 1.150 [ "$src" ] || set_src_path 1.151 [ "$DESTDIR" ] || DESTDIR="$WOK/$PACKAGE/install" 1.152 [ "$CONFIG_SITE" ] || CONFIG_SITE=/etc/config.site 1.153 @@ -621,18 +621,18 @@ 1.154 compile_rules 1.155 1.156 # Check if config.site has been used. 1.157 - # /!\ disabled since it screw the return_code of the step. 1.158 + # /!\ disabled since it screws the return_code of the step. 1.159 #if [ -f /tmp/config.site ]; then 1.160 # rm /tmp/config.site 1.161 #else 1.162 # tazwok_warning "config.site hasn't been used during \ 1.163 -#configuration process." 1.164 +#the configuration process." 1.165 #fi 1.166 report end-step 1.167 fi 1.168 } 1.169 1.170 -# Check for loop in deps tree. /!\ can be removed 1.171 +# Check for loop in deps tree. /!\ can be removed. 1.172 check_for_deps_loop() 1.173 { 1.174 local list 1.175 @@ -643,7 +643,7 @@ 1.176 [ -n "$1" ] || return 1.177 list="" 1.178 1.179 - # Filter out already processed deps 1.180 + # Filter out already processed deps. 1.181 for i in $@; do 1.182 case " $ALL_DEPS" in 1.183 *\ $i\ *);; 1.184 @@ -692,7 +692,7 @@ 1.185 fi 1.186 revert_vcs_failure 1.187 else 1.188 - tazwok_warning "Needs git to download the source tarball from $file, please add it as build-depend." 1.189 + tazwok_warning "Needs git to download the source tarball from $file, please add it as a build-depend." 1.190 continue 1.191 fi 1.192 ;; 1.193 @@ -709,7 +709,7 @@ 1.194 fi 1.195 revert_vcs_failure 1.196 else 1.197 - tazwok_warning "Needs bazaar to download the source tarball from $file, please add it as build-depend." 1.198 + tazwok_warning "Needs bazaar to download the source tarball from $file, please add it as a build-depend." 1.199 continue 1.200 fi 1.201 ;; 1.202 @@ -726,7 +726,7 @@ 1.203 fi 1.204 revert_vcs_failure 1.205 else 1.206 - tazwok_warning "Needs subversion to download the source tarball from $file, please add it as build-depend." 1.207 + tazwok_warning "Needs subversion to download the source tarball from $file, please add it as a build-depend." 1.208 continue 1.209 fi 1.210 ;; 1.211 @@ -743,7 +743,7 @@ 1.212 fi 1.213 revert_vcs_failure 1.214 else 1.215 - tazwok_warning "Needs mercurial to download the source tarball from $file, please add it as build-depend." 1.216 + tazwok_warning "Needs mercurial to download the source tarball from $file, please add it as a build-depend." 1.217 continue 1.218 fi 1.219 ;; 1.220 @@ -756,7 +756,7 @@ 1.221 wget -q --no-check-certificate $file && break 1.222 fi 1.223 else 1.224 - tazwok_warning "Needs wget to download the source tarball from $file, please add it as build-depend." 1.225 + tazwok_warning "Needs wget to download the source tarball from $file, please add it as a build-depend." 1.226 continue 1.227 fi 1.228 ;; 1.229 @@ -777,13 +777,13 @@ 1.230 done 1.231 } 1.232 1.233 -# Regenerate every package that wants a PACKAGE compiled 1.234 +# Regenerate every package that wants a PACKAGE compiled. 1.235 refresh_packages_from_compile() 1.236 { 1.237 - # make tazwok genpkg happy 1.238 + # make tazwok genpkg happy. 1.239 mkdir $WOK/$PACKAGE/taz 1.240 1.241 - # Cook rwanted in default or specied order 1.242 + # Cook rwanted in default or specied order. 1.243 genlist=" $(look_for_rwanted | tr '\n' ' ') " 1.244 for i in $(look_for_cookopt genpkg | tac); do 1.245 [ "${genlist/ $i }" = "$genlist" ] && continue 1.246 @@ -874,7 +874,7 @@ 1.247 report end-step 1.248 } 1.249 1.250 -# Remove .pyc and .pyo files from packages 1.251 +# Remove .pyc and .pyo files from packages. 1.252 py_compiled_files_remove() 1.253 { 1.254 report step "Removing all .pyc and .pyo files from package ..." 1.255 @@ -949,14 +949,14 @@ 1.256 echo $PACKAGE >> $PACKAGES_REPOSITORY/broken 1.257 fi 1.258 1.259 - # Remove pkg from cooklist to avoid re-cook it if no changes happens 1.260 + # Remove pkg from cooklist to avoid re-cook it if no changes happen 1.261 # in the cook stuff. 1.262 sed "/^$PACKAGE$/d" -i $PACKAGES_REPOSITORY/cooklist 1.263 sed "/^$PACKAGE$/d" -i $PACKAGES_REPOSITORY/commit 1.264 1.265 gen_cookmd5 1.266 1.267 - # Return 1 to make report know that's mother-function failed. 1.268 + # Return 1 to make report know that its mother-function failed. 1.269 return 1 1.270 } 1.271 1.272 @@ -1004,7 +1004,7 @@ 1.273 report end-step 1.274 1.275 # Skip generic files for packages with a WANTED variable 1.276 - # (dev and splited pkgs). 1.277 + # (dev and split pkgs). 1.278 if [ ! "$WANTED" ]; then 1.279 copy_generic_files 1.280 fi 1.281 @@ -1066,7 +1066,7 @@ 1.282 [ "$prev_VERSION" ] && pkg_file=$rep/$PACKAGE-$prev_VERSION.tazpkg && break 1.283 done 1.284 if [ "$pkg_file" ]; then 1.285 - report step "Look for major/minor update in libraries" 1.286 + report step "Looking for major/minor updates in libraries" 1.287 get_pkg_files $pkg_file 1.288 cd $WOK/$PACKAGE/taz/$PACKAGE-$VERSION 1.289 fgrep ".so" files.list | egrep -v "[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*" | \ 1.290 @@ -1107,7 +1107,7 @@ 1.291 1.292 # Build cpio archives. Find, cpio and gzip the fs, finish by 1.293 # removing the fs tree. 1.294 - # Don't log this because compression always output error messages. 1.295 + # Don't log this because compression always outputs error messages. 1.296 find fs -print | cpio -o -H newc | case "$PACKAGE-$COMPRESSION" in 1.297 tazpkg-lzma) gzip > fs.cpio.gz;; 1.298 *-lzma) lzma e fs.cpio.lzma -si;; 1.299 @@ -1138,7 +1138,7 @@ 1.300 1.301 # Recook of reverse-depends if package was broken. 1.302 if grep -q "^$PACKAGE$" $PACKAGES_REPOSITORY/broken; then 1.303 - report step "Planning re-try a cook of reverse depends" 1.304 + report step "Planning a re-try cook of reverse depends" 1.305 sed "/^$PACKAGE$/d" -i $PACKAGES_REPOSITORY/broken 1.306 for rdep in $(look_for_rdep); do 1.307 grep -q "^$rdep$" $PACKAGES_REPOSITORY/broken || continue 1.308 @@ -1162,7 +1162,7 @@ 1.309 1.310 ######################################################################## 1.311 # This section contains functions used by several other functions 1.312 -# bellow. 1.313 +# below. 1.314 ######################## 1.315 1.316 # Look for receipt/files.list in wok. If they can't be found, get them 1.317 @@ -1197,7 +1197,7 @@ 1.318 1.319 packages_db_start 1.320 unset RECEIPT 1.321 - report step "Reading datas from all packages" 1.322 + report step "Reading data from all packages" 1.323 for pkg in $(echo $pkg_repository/*.tazpkg | fgrep -v '*'); do 1.324 get_packages_info 1.325 done 1.326 @@ -1280,18 +1280,18 @@ 1.327 if [ ! -s packages.txt ]; then 1.328 echo "# SliTaz GNU/Linux - Packages list 1.329 # 1.330 -# Packages : unknow 1.331 +# Packages : unknown 1.332 # Date : $(date +%Y-%m-%d\ \%H:%M:%S) 1.333 # 1.334 " > packages.txt 1.335 else 1.336 - sed -e 's/^# Packages :.*/# Packages : unknow/' \ 1.337 + sed -e 's/^# Packages :.*/# Packages : unknown/' \ 1.338 -e "s/# Date :.*/# Date : $(date +%Y-%m-%d\ \%H:%M:%S)/" \ 1.339 -i packages.txt 1.340 fi 1.341 1.342 - # Needed in some case as tazwok define RECEIPT at configuration time 1.343 - # in this particular case it can broke the script. 1.344 + # Needed in some cases as tazwok defines RECEIPT at configuration time 1.345 + # in this particular case it can break the script. 1.346 unset RECEIPT 1.347 } 1.348 1.349 @@ -1312,11 +1312,11 @@ 1.350 1.351 get_packages_info() 1.352 { 1.353 - # If there's no taz folder in the wok, extract infos from the 1.354 + # If there's no taz folder in the wok, extract info from the 1.355 # package. 1.356 get_pkg_files $pkg 1.357 source_receipt 1.358 - echo "Getting datas from $PACKAGE" 1.359 + echo "Getting data from $PACKAGE" 1.360 1.361 cat >> $pkg_repository/packages.txt << _EOT_ 1.362 $PACKAGE 1.363 @@ -1335,7 +1335,7 @@ 1.364 # Packages.desc is used by Tazpkgbox <tree>. 1.365 echo "$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE" >> $pkg_repository/packages.desc 1.366 1.367 - # Packages.equiv is used by tazpkg install to check depends 1.368 + # Packages.equiv is used by tazpkg install to check depends. 1.369 for i in $PROVIDE; do 1.370 DEST="" 1.371 echo $i | fgrep -q : && DEST="${i#*:}:" 1.372 @@ -1375,7 +1375,7 @@ 1.373 pkgs=$(wc -l packages.list | sed 's/ .*//') 1.374 sed "s/# Packages : .*/# Packages : $pkgs/" -i packages.txt 1.375 1.376 - # If lists was updated it's generally needed to sort them well. 1.377 + # If lists were updated it's generally needed to sort them well. 1.378 if ! sort -c packages.list 2> /dev/null; then 1.379 report step "Sorting packages lists" 1.380 for file in packages.list packages.desc packages.equiv; do 1.381 @@ -1385,7 +1385,7 @@ 1.382 report end-step 1.383 fi 1.384 1.385 - # Dont log this because lzma always output error. 1.386 + # Dont log this because lzma always output errors. 1.387 lzma e files.list files.list.lzma 1.388 rm -f files.list 1.389 [ -f packages.equiv ] || touch packages.equiv 1.390 @@ -1498,7 +1498,7 @@ 1.391 done 1.392 if [ "$status" = start ]; then 1.393 cp -f $tmp/db /tmp/remain-depends.txt 1.394 - echo "Can't go further because there's depency(ies) loop(s). The remaining packages will be commentend in the cookorder and will be unbuild in case of major update until the problem is solved." >&2 1.395 + echo "Can't go further because of dependency loop(s). The remaining packages will be commented in the cookorder and will be unbuilt in case of major updates until the problem is solved." >&2 1.396 for blocked in $(cut -f 1 $tmp/db); do 1.397 echo "$blocked" >> $PACKAGES_REPOSITORY/blocked 1.398 done 1.399 @@ -1523,7 +1523,7 @@ 1.400 ######################################################################## 1.401 # SCAN CORE 1.402 ######################## 1.403 -# Include various scan core-functions. It's not intended to be used 1.404 +# Includes various scan core-functions. It's not intended to be used 1.405 # directly : prefer scan wrappers in next section. 1.406 1.407 look_for_dep() 1.408 @@ -1768,7 +1768,7 @@ 1.409 } 1.410 1.411 ######################################################################## 1.412 -# This section contains functions to check package repository and 1.413 +# This section contains functions to check the package repository and 1.414 # find which packages to cook. 1.415 ######################## 1.416 1.417 @@ -1805,7 +1805,7 @@ 1.418 # - in the wok/PACKAGE/taz/* folder 1.419 # - in the receipt in the package in incoming repository 1.420 # - in the receipt in the package in packages repository 1.421 - # If md5sum match, there's no commit. 1.422 + # If md5sums match, there's no commit. 1.423 check_for_commit_using_md5sum() 1.424 { 1.425 if [ ! -f $WOK/$PACKAGE/md5 ]; then 1.426 @@ -1941,7 +1941,7 @@ 1.427 fi 1.428 done 1.429 1.430 - # Remaining packages in cooklist are thoses without compile_rules. 1.431 + # Remaining packages in cooklist are those without compile_rules. 1.432 # They can be cooked first in any order. 1.433 if [ -f $tmp/cooklist.tmp ]; then 1.434 cat $tmp/cooklist.tmp >> $tmp/cooklist 1.435 @@ -1968,14 +1968,14 @@ 1.436 1.437 check_for_incoming() 1.438 { 1.439 - report step "Check that all packages were cooked fine" 1.440 + report step "Checking that all packages were cooked OK" 1.441 [ -s $INCOMING_REPOSITORY/packages.desc ] || { 1.442 echo "No packages in $INCOMING_REPOSITORY." 1.443 report end-step; return; } 1.444 if [ -s $PACKAGES_REPOSITORY/broken ]; then 1.445 missingpkg=$(look_for_missing_pkg broken) 1.446 if [ "$missingpkg" ]; then 1.447 - echo "Don't move incoming packages to main repository because theses ones are broken:" >&2 1.448 + echo "Don't move incoming packages to main repository because these ones are broken:" >&2 1.449 echo "$missingpkg" 1.450 report end-step 1.451 return 1 1.452 @@ -1984,7 +1984,7 @@ 1.453 if [ -s $PACKAGES_REPOSITORY/cooklist ]; then 1.454 missingpkg=$(look_for_missing_pkg cooklist) 1.455 if [ "$missingpkg" ]; then 1.456 - echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2 1.457 + echo "Don't move incoming packages to main repository because these ones need to be cooked:" >&2 1.458 echo "$missingpkg" 1.459 report end-step 1.460 return 1 1.461 @@ -1998,7 +1998,7 @@ 1.462 if [ -s $PACKAGES_REPOSITORY/cooklist ]; then 1.463 missingpkg=$(look_for_missing_pkg cooklist) 1.464 if [ "$missingpkg" ]; then 1.465 - echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2 1.466 + echo "Don't move incoming packages to main repository because these ones need to be cooked:" >&2 1.467 echo "$missingpkg" 1.468 report end-step 1.469 return 1 1.470 @@ -2056,7 +2056,7 @@ 1.471 done > flavors.list 1.472 [ -x /usr/bin/clean-chroot ] && clean-chroot 1.473 else 1.474 - echo "Can't create up-to-date flavors because tazlito package is missing." >&2 1.475 + echo "Can't create up-to-date flavors because the tazlito package is missing." >&2 1.476 fi 1.477 report end-step 1.478 } 1.479 @@ -2144,7 +2144,7 @@ 1.480 unset store_pkgname 1.481 1.482 # Upgrade to cooked packages if it was previously installed. 1.483 - report step "Look for package(s) to upgrade" 1.484 + report step "Looking for package(s) to upgrade" 1.485 for pkg in $(look_for_rwanted) $PACKAGE; do 1.486 if [ -d $INSTALLED/$pkg ]; then 1.487 tazpkg get-install $pkg --forced 1.488 @@ -2168,7 +2168,7 @@ 1.489 [ "$regen_cooklist" ] && unset regen_cooklist && \ 1.490 [ "$COMMAND" != cook ] && sort_cooklist 1.491 1.492 - # Some hacks to set the bloc & function status as failed if cook was 1.493 + # Some hacks to set the bloc & function status as failed if cook has 1.494 # failed. 1.495 report_return_code=$cook_code 1.496 report close-bloc 1.497 @@ -2181,7 +2181,7 @@ 1.498 { 1.499 if [ -s $tmp/cooklist ]; then 1.500 if [ -f /usr/bin/tazchroot ]; then 1.501 - # Note : options -main variables- are automatically keeped by 1.502 + # Note : options -main variables- are automatically kept by 1.503 # the sub-applications tazchroot/tazwok; as well as report data. 1.504 cd $LOCAL_REPOSITORY 1.505 [ ! -f tazchroot.conf ] && configure_tazchroot 1.506 @@ -2205,15 +2205,15 @@ 1.507 cat > $LOCAL_REPOSITORY/tazchroot.conf << EOF 1.508 # Tazchroot configuration file - created by tazwok. 1.509 1.510 -# Default chroot path 1.511 +# Default chroot path. 1.512 SLITAZ_DIR=$SLITAZ_DIR 1.513 SLITAZ_VERSION=$SLITAZ_VERSION 1.514 $( [ "$undigest" ] && echo "undigest=$undigest" ) 1.515 LOCAL_REPOSITORY=$SLITAZ_DIR/$(if [ "$undigest" ]; then echo '$undigest'; else echo '$SLITAZ_VERSION'; fi) 1.516 chroot_dir=\$LOCAL_REPOSITORY/chroot 1.517 1.518 -# Default scripts path (theses scripts are added in the 1.519 -# $chroot_dir/usr/bin and can be called with tazchroot script) 1.520 +# Default scripts path (these scripts are added to the 1.521 +# $chroot_dir/usr/bin and can be called with tazchroot script). 1.522 script_dir=/usr/lib/slitaz/chroot-scripts/tazwok 1.523 1.524 # List of directories to mount. 1.525 @@ -2235,7 +2235,7 @@ 1.526 -i \$chroot_dir/etc/slitaz/slitaz.conf 1.527 $( [ "$undigest" ] && echo ' echo "undigest='"$undigest"'" >> $chroot_dir/etc/slitaz/tazwok.conf') 1.528 sed 's/LC_ALL/LC_ALL=POSIX/' -i \$chroot_dir/etc/profile 1.529 - # The build bot may run in a sandbox: link sandbox lockfile 1.530 + # The build bot may run in a sandbox: link sandbox lockfile. 1.531 ln -s \$LOCAL_REPOSITORY/sandbox/proc/1 \$chroot_dir/proc/1 1.532 } 1.533 1.534 @@ -2275,7 +2275,7 @@ 1.535 ######################### END OF NEW FUNCTIONS ######################### 1.536 ######################################################################## 1.537 1.538 -# List packages providing a virtual package 1.539 +# List packages providing a virtual package. 1.540 whoprovide() 1.541 { 1.542 local i; 1.543 @@ -2315,7 +2315,7 @@ 1.544 $EDITOR $WOK/$PACKAGE/receipt 1.545 ;; 1.546 build-depends) 1.547 - # List dependencies to rebuild wok, or only a package 1.548 + # List dependencies to rebuild wok, or only a package. 1.549 get_tazwok_config 1.550 report(){ : ; } 1.551 if [ ! "$PACKAGE" ] || [ "$PACKAGE" = toolchain ]; then 1.552 @@ -2341,7 +2341,7 @@ 1.553 gen_cook_list 1.554 ;; 1.555 check-depends) 1.556 - # Check package depends /!\ 1.557 + # Check package depends /!\. 1.558 get_tazwok_config 1.559 echo "" 1.560 echo -e "\033[1mCheck every receipt for DEPENDS - doesn't scan ELF files\033[0m 1.561 @@ -2349,7 +2349,7 @@ 1.562 TMPDIR=/tmp/tazwok$$ 1.563 DEFAULT_DEPENDS="glibc-base gcc-lib-base" 1.564 1.565 - # Build ALL_DEPENDS variable 1.566 + # Build ALL_DEPENDS variable. 1.567 scan_dep() 1.568 { 1.569 local i 1.570 @@ -2369,13 +2369,13 @@ 1.571 done 1.572 } 1.573 1.574 - # Check for ELF file 1.575 + # Check for ELF file. 1.576 is_elf() 1.577 { 1.578 [ "$(dd if=$1 bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ] 1.579 } 1.580 1.581 - # Print shared library dependencies 1.582 + # Print shared library dependencies. 1.583 ldd() 1.584 { 1.585 LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so $1 2> /dev/null 1.586 @@ -2422,7 +2422,7 @@ 1.587 rm -rf $TMPDIR 1.588 ;; 1.589 check) 1.590 - # Check wok consistency 1.591 + # Check wok consistency. 1.592 get_tazwok_config 1.593 echo "" 1.594 echo -e "\033[1mWok and packages checking\033[0m 1.595 @@ -2496,7 +2496,7 @@ 1.596 echo -e "$MSG $i" 1.597 MSG="" 1.598 done 1.599 - MSG="Dependencies loop between $PACKAGE and :\n" 1.600 + MSG="Dependency loop between $PACKAGE and :\n" 1.601 ALL_DEPS="" 1.602 check_for_deps_loop $PACKAGE $DEPENDS 1.603 [ -d $WOK/$pkg/taz ] && for i in $BUILD_DEPENDS; do 1.604 @@ -2667,7 +2667,7 @@ 1.605 get_tazwok_config 1.606 report(){ : ; } 1.607 # When using sort-cooklist, the script should behave as for gen-cooklist 1.608 - # The only difference between theses two is where the output is sended. 1.609 + # The only difference between these two is where the output is sent. 1.610 COMMAND=gen-cooklist 1.611 cooklist=$LIST 1.612 gen_cook_list 1.613 @@ -2687,7 +2687,7 @@ 1.614 cook_list 1.615 ;; 1.616 clean) 1.617 - # Clean up a package work directory + thoses which want it. 1.618 + # Clean up a package work directory + those which want it. 1.619 # 1.620 get_tazwok_config 1.621 check_for_package_on_cmdline 1.622 @@ -2728,7 +2728,7 @@ 1.623 echo "" 1.624 ;; 1.625 clean-wok) 1.626 - # Clean all packages in the work directory 1.627 + # Clean all packages in the work directory. 1.628 # 1.629 get_tazwok_config 1.630 source_lib report 1.631 @@ -2760,13 +2760,13 @@ 1.632 exit 1 1.633 fi 1.634 echo "" 1.635 - echo -e "\033[1mObsolete/unrelated-to-wok sourcess :\033[0m" 1.636 + echo -e "\033[1mObsolete/unrelated-to-wok sources :\033[0m" 1.637 horizontal_line 1.638 cat $tmp/obsolete 1.639 horizontal_line 1.640 echo "$(wc -l $tmp/obsolete | cut -f1 -d' ') tarballs to remove." 1.641 echo "" 1.642 - echo -n "Please confirm removing (type uppercase YES): " 1.643 + echo -n "Please confirm before removing (type uppercase YES): " 1.644 read answer 1.645 if [ "$answer" = YES ]; then 1.646 echo -n "Removing old sources..." 1.647 @@ -2872,7 +2872,7 @@ 1.648 status 1.649 # Interactive mode, asking and seding. 1.650 if [ "$3" = "--interactive" ]; then 1.651 - echo "Entering into interactive mode..." 1.652 + echo "Entering interactive mode..." 1.653 echo "================================================================================" 1.654 echo "Package : $PACKAGE" 1.655 # Version. 1.656 @@ -2942,7 +2942,7 @@ 1.657 tazpkg get-install mercurial 1.658 else 1.659 echo "" >&2 1.660 - echo "You need to install mercurial to get wok from hg (recommended). Oherwise, you can switch wok get method to \"tarball\" into $LOCAL_RESOSITORY/tazwok.conf (per-repository configuration, it not always exists) or /etc/slitaz/tazwok.conf (global configuration)." | fold -s >&2 1.661 + echo "You need to install mercurial to get wok from hg (recommended). Otherwise, you can switch wok get method to \"tarball\" into $LOCAL_REPOSITORY/tazwok.conf (per-repository configuration, if it doesn't exist) or /etc/slitaz/tazwok.conf (global configuration)." | fold -s >&2 1.662 echo "">&2 1.663 exit 1 1.664 fi 1.665 @@ -3050,7 +3050,7 @@ 1.666 echo "$(wc -l $tmp/tags | cut -f1 -d ' ') tags listed." 1.667 ;; 1.668 check-src) 1.669 - # Verify if upstream package is still available 1.670 + # Verify if upstream package is still available. 1.671 # 1.672 get_tazwok_config 1.673 check_for_package_on_cmdline 1.674 @@ -3200,7 +3200,7 @@ 1.675 cd $LOCAL_REPOSITORY 1.676 configure_tazchroot 1.677 else 1.678 - echo "The packages tazchroot need to be installed" >&2 1.679 + echo "The package tazchroot needs to be installed" >&2 1.680 exit 1 1.681 fi 1.682 ;; 1.683 @@ -3213,7 +3213,7 @@ 1.684 [ ! -f tazchroot.conf ] && configure_tazchroot 1.685 tazchroot 1.686 else 1.687 - echo "The packages tazchroot need to be installed" >&2 1.688 + echo "The package tazchroot needs to be installed" >&2 1.689 exit 1 1.690 fi 1.691 ;; 1.692 @@ -3227,11 +3227,11 @@ 1.693 tazchroot cook-toolchain 1.694 # Buggy : chroot can be elsewhere. 1.695 rm -r $LOCAL_REPOSITORY/chroot 1.696 - # /!\ to be writed : 1.697 + # /!\ to be written : 1.698 # next rm chroot and plan cook-all by pushing all packages 1.699 # in cooklist. 1.700 else 1.701 - echo "The packages tazchroot need to be installed" >&2 1.702 + echo "The package tazchroot needs to be installed" >&2 1.703 exit 1 1.704 fi 1.705 ;; 1.706 @@ -3251,7 +3251,7 @@ 1.707 [ -d $INSTALLED/$pkg ] || missing="$missing $pkg" 1.708 done 1.709 if [ "$missing" ]; then 1.710 - echo "You need to install those packages to start webserver: $missing." >&2 1.711 + echo "You need to install these packages to start webserver: $missing." >&2 1.712 exit 1 1.713 fi 1.714 if [ ! -f "$LOCAL_REPOSITORY/tazwok.conf" ]; then 1.715 @@ -3294,7 +3294,7 @@ 1.716 [ -L "$WEBSERVER/web" ] || ln -s /usr/share/slitaz/web $WEBSERVER 1.717 echo "WEBSERVER=\"$WEBSERVER\"" >> $LOCAL_REPOSITORY/tazwok.conf 1.718 if [ -L "$WEBSERVER/conf.php" ]; then 1.719 - echo "Do yo want to make ${undigest:-$SLITAZ_VERSION} the default page (y/N) ? " 1.720 + echo "Do you want to make ${undigest:-$SLITAZ_VERSION} the default page (y/N) ? " 1.721 read answer 1.722 if [ "$answer" = y ]; then 1.723 rm $WEBSERVER/conf.php 1.724 @@ -3315,7 +3315,7 @@ 1.725 rm $WEBSERVER/${undigest:-$SLITAZ_VERSION}-${dir##*/} 1.726 done 1.727 if ! [ -s "$WEBSERVER/repositories.list" ]; then 1.728 - echo "$WEBSERVER/repositories.list is empty; tazwok doesn't remove the server automatically in case you have important stuff in it. If it's not the case, you can remove it using: rm -r $WEBSERVER" 1.729 + echo "$WEBSERVER/repositories.list is empty; tazwok doesn't remove the server automatically in case you have important stuff in it. If that's not the case, you can remove it using: rm -r $WEBSERVER" 1.730 rm $WEBSERVER/conf.php 1.731 elif [ "$(readlink $WEBSERVER/conf.php)" = "$WEBSERVER/conf-${undigest:-$SLITAZ_VERSION}.php" ]; then 1.732 echo "${undigest:-$SLITAZ_VERSION} was the default version to use; switched to : $(sed 1!d $WEBSERVER/repositories.list)" 1.733 @@ -3333,7 +3333,7 @@ 1.734 check_root 1.735 check_for_package_on_cmdline 1.736 if ! [ -f $WOK/$PACKAGE/receipt ]; then 1.737 - echo "Can't find $PACKAGE into wok." >&2 1.738 + echo "Can't find $PACKAGE in wok." >&2 1.739 echo "" 1.740 exit 1 1.741 fi 1.742 @@ -3359,7 +3359,7 @@ 1.743 check_root 1.744 check_for_package_on_cmdline 1.745 if ! [ -f $WOK/$PACKAGE/receipt ]; then 1.746 - echo "Can't find $PACKAGE into wok." >&2 1.747 + echo "Can't find $PACKAGE in wok." >&2 1.748 echo "" 1.749 exit 1 1.750 fi