tazwok rev 434 4.3
Merge changes from default
| author | Antoine Bodin <gokhlayeh@slitaz.org> |
|---|---|
| date | Tue Mar 08 23:08:17 2011 +0100 (2011-03-08) |
| parents | 5b8e38bbae17 ff412a1044b0 |
| children | 20352491a9df |
| files | examples/tazwok.conf tazwok |
line diff
1.1 --- a/.hgtags Sun Mar 06 19:02:57 2011 +0100 1.2 +++ b/.hgtags Tue Mar 08 23:08:17 2011 +0100 1.3 @@ -20,3 +20,4 @@ 1.4 44c327b2c5f807df9a580eaf6424d8096d71cad0 4.2.3 1.5 13e14fe449a3fd68126f9df0a0ed40a5dd5f98c6 4.2.4 1.6 433aa071e16c7f61966e426207dfa3f142859458 4.2.5 1.7 +bf449151a34258e71f7ec0868f3e521d22995817 4.2.6
2.1 --- a/chroot-scripts/cook-toolchain Sun Mar 06 19:02:57 2011 +0100 2.2 +++ b/chroot-scripts/cook-toolchain Tue Mar 08 23:08:17 2011 +0100 2.3 @@ -20,7 +20,7 @@ 2.4 2.5 report step "Initializing tools & environment" 2.6 2.7 -# Theses fours packages will be needed later. 2.8 +# These four packages will be needed later. 2.9 for p in libtaz tazwok slitaz-base-files tazpkg; do 2.10 tazwok cook $p 2.11 done 2.12 @@ -32,7 +32,7 @@ 2.13 LC_ALL=POSIX 2.14 2.15 # Set BUILD_HOST to something like $ARCH-tmp-linux-gnu to enable 2.16 -# of the temporary toolchain. 2.17 +# the temporary toolchain. 2.18 BUILD_HOST=$(echo $BUILD_HOST | sed 's/\(.*\)-\(.*\)-linux-gnu/\1-tmp-linux-gnu/') 2.19 2.20 PATH=/tools/bin:/tools/usr/bin:/tools/sbin:/tools/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin 2.21 @@ -89,10 +89,10 @@ 2.22 prepare_package 2.23 report step "Running compilation rules" 2.24 2.25 - # Use compile_rules if there's not function cook_tmp_toolchain in 2.26 + # Use compile_rules if there's no function cook_tmp_toolchain in 2.27 # the receipt. Works well if both functions are the same, as 2.28 - # cook-toolchain use it's own config.site to set different defaults 2.29 - # pathes. 2.30 + # cook-toolchain uses its own config.site to set different default 2.31 + # paths. 2.32 if grep -q ^cook_tmp_toolchain\(\)$ $WOK/$PACKAGE/receipt; then 2.33 cook_tmp_toolchain 2.34 else 2.35 @@ -104,7 +104,7 @@ 2.36 report end-sublog 2.37 done 2.38 2.39 -# Now we erase previous chroot tools and we switch to temporary 2.40 +# Now we erase previous chroot tools and switch to temporary 2.41 # toolchain. 2.42 2.43 report step "Setting up temporary toolchain environnment" 2.44 @@ -140,7 +140,7 @@ 2.45 esac 2.46 2.47 mkdir -p /bin /usr/bin /usr/lib 2.48 -# doing a loop so we don't get {bash,cat,echo,pwd,stty} softlink 2.49 +# Doing a loop so we don't get {bash,cat,echo,pwd,stty} softlink 2.50 BASIC_APPS="bash cat echo pwd stty" 2.51 for i in $BASIC_APPS; do 2.52 ln -s /tools/bin/$i /bin/$i 2.53 @@ -159,7 +159,7 @@ 2.54 # Finally, cook final* version of the toolchain packages. 2.55 # * : recook toolchain against itself minus linux-api-headers 2.56 # glibc binutils & gcc can be a good idea to make things 2.57 -# more robust & stable; in some cases it solves dependencies 2.58 +# more robust & stable; in some cases it solves dependency 2.59 # loops. 2.60 2.61 # Incoming packages as the only source for packages. 2.62 @@ -171,7 +171,7 @@ 2.63 tazwok gen-cooklist ${undigest:+--undigest=$undigest} > /tmp/toolchain.list 2.64 2.65 # Next cook packages one by one. 2.66 -# Cooking the list doesn't works because sh wouldn't take care 2.67 +# Cooking the list doesn't work because sh won't take care 2.68 # of the presence of new executables even if they're first in 2.69 # $PATH. 2.70
3.1 --- a/chroot-scripts/gen-iso Sun Mar 06 19:02:57 2011 +0100 3.2 +++ b/chroot-scripts/gen-iso Tue Mar 08 23:08:17 2011 +0100 3.3 @@ -1,6 +1,6 @@ 3.4 #!/bin/sh 3.5 # Little script to cook flavor in tazwok chroot waiting 3.6 -# for something more consistent into tazlito. 3.7 +# for something more consistent in tazlito. 3.8 3.9 [ "$1" ] || { echo "Usage: gen-iso flavorname [gzip]" >&2; exit 1; } 3.10 source /usr/lib/slitaz/libtaz 3.11 @@ -33,6 +33,6 @@ 3.12 clean-chroot 3.13 report stop 3.14 else 3.15 - echo "$SLITAZ_DIR/flavors/$1 doesn't exists." >&2 3.16 + echo "$SLITAZ_DIR/flavors/$1 doesn't exist." >&2 3.17 exit 1 3.18 fi
4.1 --- a/examples/config.site Sun Mar 06 19:02:57 2011 +0100 4.2 +++ b/examples/config.site Tue Mar 08 23:08:17 2011 +0100 4.3 @@ -1,33 +1,33 @@ 4.4 -# This file contains default option passed to ./configure at compile time. 4.5 -# Variables are setted this way : 4.6 +# This file contains default options passed to ./configure at compile time. 4.7 +# Variables are set this way : 4.8 # { [ "$var" = NONE ] || [ ! "$var" ] ; } && var= 4.9 -# This is because config.site overwrite options passed directly in 4.10 +# This is because config.site overwrites options passed directly in 4.11 # configure, like ./configure --var= 4.12 # 4.13 -# Here, we don't want overwrite default configuration : we want to 4.14 -# setup configure with default path only if nothing has been given 4.15 +# Here, we don't want to overwrite the default configuration : we want to 4.16 +# setup configure with a default path only if nothing has been given 4.17 # on the configure command-line. This allow contributors to overwrite 4.18 -# the defaults path filled here in the recipes. 4.19 +# the default paths filled here by the recipes. 4.20 # 4.21 -# Path to the config.site is given to configure using the environnment 4.22 +# Path to the config.site is given to configure using the environment 4.23 # variable CONFIG_SITE 4.24 # tazwok does that work before executing compile rules. 4.25 # 4.26 -# If you want to use you're own config.site, you can use : 4.27 +# If you want to use your own config.site, you can use : 4.28 # export CONFIG_SITE=path_to_my_config.site 4.29 # in the compilation_rules of a receipt. 4.30 -# It can be usefull if you want to share default configuration between 4.31 +# It can be useful if you want to share a default configuration between 4.32 # some groups of packages like GNOME or KDE ones. 4.33 # 4.34 -# To make tazwok configuration easier, we use variable from 4.35 -# /etc/tazwok.conf here. Note that only concerns configure options : 4.36 +# To make tazwok configuration easier, we use variables from 4.37 +# /etc/tazwok.conf here. Note this only concerns configure options : 4.38 # make flags (MAKEFLAGS, CFLAGS, CXXFLAGS and DESTDIR) are exported 4.39 -# to environment variables; options setted here are thoses we can't 4.40 -# export in environnment variables because it doesn't works. 4.41 +# to environment variables; options set here are those we can't 4.42 +# export environnment variables to because they don't work. 4.43 4.44 # Some variable are prefixed by "${prefix}" instead of "${datarootdir}". 4.45 -# For thoses case we use "${datadir}" because there's configure script 4.46 -# generally don't know about "${datarootdir}" (too olds). 4.47 +# For those cases we use "${datadir}" because the configure script 4.48 +# generally doesn't know about "${datarootdir}" (too old). 4.49 if echo "$localedir" | grep -q \${prefix}; then 4.50 localedir=$( echo "$localedir" | sed 's/${prefix}/${datarootdir}/') 4.51 fi 4.52 @@ -38,7 +38,7 @@ 4.53 mandir=$( echo "$mandir" | sed 's/${prefix}/${datarootdir}/') 4.54 fi 4.55 4.56 -# Use default values if one of theses configure variable is not set. 4.57 +# Use default values if one of these configure variables is not set. 4.58 { [ "$prefix" = NONE ] || [ ! "$prefix" ] ; } && prefix=$default_prefix 4.59 { [ "$datarootdir" = NONE ] || [ ! "$datarootdir" ] ; } && datarootdir=$default_datarootdir 4.60 { [ "$datadir" = NONE ] || [ ! "$datadir" ] ; } && datadir=$datarootdir 4.61 @@ -48,7 +48,7 @@ 4.62 { [ "$build" = NONE ] || [ ! "$build" ] ; } && build=$default_build 4.63 { [ "$host" = NONE ] || [ ! "$host" ] ; } && host=$default_host 4.64 4.65 -# Print information about theses variables. 4.66 +# Print information about these variables. 4.67 echo "prefix = $prefix 4.68 datarootdir = $datarootdir 4.69 datadir = $datadir 4.70 @@ -59,5 +59,5 @@ 4.71 host = $host 4.72 " 4.73 4.74 -# config.site is used by tazwok to check that config.site script has been used. 4.75 +# config.site is used by tazwok to check that the config.site script has been used. 4.76 touch /tmp/config.site
5.1 --- a/examples/tazwok.conf Sun Mar 06 19:02:57 2011 +0100 5.2 +++ b/examples/tazwok.conf Tue Mar 08 23:08:17 2011 +0100 5.3 @@ -3,7 +3,7 @@ 5.4 5.5 # WOK_UPDATE_METHOD can be "tarball" or "hg" 5.6 # tarball: download the full tarball and copy it into build-wok. 5.7 -# hg: download only the new changes, need mercurial installed. 5.8 +# hg: download only the new changes, needs mercurial installed. 5.9 WOK_UPDATE_METHOD="hg" 5.10 5.11 TARBALL_WOK="$MIRROR/wok.tar.lzma" 5.12 @@ -32,7 +32,7 @@ 5.13 # http://www.gentoo.org/doc/en/gcc-optimization.xml 5.14 # http://en.gentoo-wiki.com/wiki/Safe_Cflags 5.15 # 5.16 -# Note : -pipe will be automatically disabled if you have less that 5.17 +# Note : -pipe will be automatically disabled if you have less than 5.18 # 512MB of free RAM to avoid gcc crashes. 5.19 # 5.20 # Default SliTaz flags - wide compatibility & optimized for i386 as it's the 5.21 @@ -40,11 +40,11 @@ 5.22 #CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer" 5.23 # Where ARCH=i386 5.24 # 5.25 -# Cook compatible packages partially optimized for you're own hardware : 5.26 +# Cook compatible packages partially optimized for your own hardware : 5.27 #CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer" 5.28 -# Where ARCH=you're arch 5.29 +# Where ARCH=your arch 5.30 # 5.31 -# Cook packages fully optimized for you're hardware - Warning, compatible only 5.32 +# Cook packages fully optimized for your hardware - Warning, compatible only 5.33 # with same hardware and newest of the same family : 5.34 #CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer" 5.35 CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer" 5.36 @@ -92,17 +92,17 @@ 5.37 COMPRESSION="lzma" 5.38 5.39 # Slitaz Toolchain : the tools used to compile all other packages. 5.40 -# Toolchain packages doesn't need to be included as build_depends 5.41 +# Toolchain packages don't need to be included as build_depends 5.42 # because they are in the chroot by default. The order in this 5.43 # variable is important : it's the compile order for the temporary 5.44 # toolchain which can be used to recook the base chroot, then all 5.45 -# the wok. Toolchain is compiled this way according the LFS book : 5.46 +# the wok. Toolchain is compiled this way according to the LFS book : 5.47 # First - binutils, GCC; at this point they are linked to the host system. 5.48 # Second - the temp toolchain using the order defined in this variable. 5.49 -# This toolchain is cross-compiled against a self-depend glibc. 5.50 +# The toolchain is cross-compiled against a self-depending glibc. 5.51 # Third - all the wok in normal order, including the toolchain packages. 5.52 # This cook order is used only if glibc/binutils/gcc/linux-api-headers 5.53 -# is updated to the next minor version or more (y.x.z -> y.x+1.z). 5.54 +# are updated to the next minor version or more (y.x.z -> y.x+1.z). 5.55 SLITAZ_TOOLCHAIN="linux-api-headers 5.56 glibc 5.57 binutils 5.58 @@ -125,7 +125,7 @@ 5.59 automake 5.60 lzma" 5.61 5.62 -# Slitaz toolchain extra : package which are needed to cook other 5.63 +# Slitaz toolchain extra : packages which are needed to cook others 5.64 # but which are not in the core temporary toolchain. 5.65 # Note : order is not important here. 5.66 SLITAZ_TOOLCHAIN_EXTRA="tazpkg
6.1 --- a/tazwok Sun Mar 06 19:02:57 2011 +0100 6.2 +++ b/tazwok Tue Mar 08 23:08:17 2011 +0100 6.3 @@ -44,7 +44,7 @@ 6.4 cook Compile and generate a package directly. 6.5 cook-list Cook all packages specified in the list by order. 6.6 cook-commit Cook all modified receipts. 6.7 - cook-all Cook all packages excepted toolchain. 6.8 + cook-all Cook all packages except toolchain. 6.9 cook-toolchain Cook the toolchain packages. 6.10 gen-cooklist Generate a sorted cooklist using packages or list. 6.11 sort-cooklist Sort the cooklist given in argument. 6.12 @@ -53,10 +53,10 @@ 6.13 new-tree Prepare a new package tree and receipt (--interactive). 6.14 gen-list (Re-)Generate a packages list for a repository. 6.15 check-list Update packages lists for a repository. 6.16 - gen-wok-db (Re-)Generate wok lists with depends and wanted datas. 6.17 + gen-wok-db (Re-)Generate wok lists with depends and wanted data. 6.18 gen-clean-wok Generate a clean wok in a dir. 6.19 clean-wok Clean entirely the wok. 6.20 - clean-src Remove old/unrelated-to-wok sources. 6.21 + clean-src Remove old/unrelated-to-wok sources. 6.22 remove Remove a package from the wok. 6.23 webserver Enable/disable webserver on localhost. 6.24 update-wok Update the wok. 6.25 @@ -66,12 +66,12 @@ 6.26 block Add package from the blocked list to prevent cooking it. 6.27 unblock Remove package from the blocked list.\n 6.28 6.29 - You can use `basename $0` command --help to list avaible options. 6.30 + You can use `basename $0` command --help to list available options. 6.31 \033[1mImportant - *: \033[0m Commands which need a rewrite." 6.32 } 6.33 6.34 -# This function display an error message without returning any error code. 6.35 -# It also log the message in source package's warnings.txt; this file can be 6.36 +# This function displays an error message without returning any error code. 6.37 +# It also logs the message in source package's warnings.txt; this file can be 6.38 # used on an eventual package page on website to display cooking warnings. 6.39 tazwok_warning() 6.40 { 6.41 @@ -294,12 +294,12 @@ 6.42 mv "$src/_pkg" $WOK/$PACKAGE/install 6.43 fi 6.44 6.45 - # Don't remove sources if a package use src variable in his 6.46 - # genpkg_rules: it maybe need something inside. 6.47 + # Don't remove sources if a package uses src variable in its 6.48 + # genpkg_rules: it maybe needs something inside. 6.49 for i in $PACKAGE $(look_for_rwanted); do 6.50 sed -n '/^genpkg_rules\(\)/','/}/'p $WOK/$i/receipt | \ 6.51 fgrep -q '$src' && tazwok_warning "Sources will not be removed \ 6.52 -because $i use \$src in his receipt." && return 6.53 +because $i uses \$src in its receipt." && return 6.54 done 6.55 6.56 report step "Removing sources directory" 6.57 @@ -308,7 +308,7 @@ 6.58 } 6.59 6.60 # Check $COOK_OPT; usage : get_cookopt particular_opt 6.61 -# Return error if not founded 6.62 +# Return error if not found 6.63 # Return args if the opt is in the format opt=arg1:arg2:etc 6.64 look_for_cookopt() 6.65 { 6.66 @@ -394,7 +394,7 @@ 6.67 # Don't cook if a depend is broken. 6.68 if [ "$broken_pkg" ]; then 6.69 MISSING_PACKAGE=$plan_remove 6.70 - echo "Can't cook $PACKAGE because broken depend(s) : $broken_pkg" >&2 6.71 + echo "Can't cook $PACKAGE because of broken depend(s) : $broken" >&2 6.72 unset plan_remove broken 6.73 6.74 # Set report step to failed. 6.75 @@ -441,7 +441,7 @@ 6.76 { 6.77 [ "$1" ] || return 6.78 report step "Removing previous build dependencies" 6.79 - echo "Removing theses packages : $@" 6.80 + echo "Removing these packages : $@" 6.81 for pkg in $@; do 6.82 [ -f "$INSTALLED/$pkg/receipt" ] && tazpkg remove $pkg --auto 6.83 done 6.84 @@ -450,7 +450,7 @@ 6.85 } 6.86 6.87 # Check if we can use the new way to handle tarball 6.88 -# or if we keep the previous method by check for 6.89 +# or if we keep the previous method by checking for 6.90 # _pkg=/src= in receipt and reverse-wanted. 6.91 check_for_var_modification() 6.92 { 6.93 @@ -470,7 +470,7 @@ 6.94 if check_for_var_modification src _pkg; then 6.95 src=$WOK/${WANTED:-$PACKAGE}/${WANTED:-$PACKAGE}-$VERSION 6.96 else 6.97 - tazwok_warning "Use original name or tarball root directory because src/_pkg are defined into the receipt (this is no more needed!)." 6.98 + tazwok_warning "Use original name or tarball root directory because src/_pkg is defined in the receipt (this is no longer needed!)." 6.99 src=$WOK/${WANTED:-$PACKAGE}/${SOURCE:-${WANTED:-$PACKAGE}}-$VERSION 6.100 fi 6.101 stuff=$WOK/$PACKAGE/stuff 6.102 @@ -555,7 +555,7 @@ 6.103 # Log process. 6.104 echo "untaring source tarball" >> $LOG 6.105 6.106 - # If $tmp_src exists, there's already the unpacked tarball into it. 6.107 + # If $tmp_src exists, there's already a unpacked tarball in it. 6.108 if ! [ -d $tmp_src ]; then 6.109 mkdir $tmp_src 6.110 if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$repack_src" = yes ]; then 6.111 @@ -597,7 +597,7 @@ 6.112 mv $tmp_src/* $WOK/$PACKAGE 6.113 repack_src=no 6.114 rm -r $tmp_src 6.115 - 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." 6.116 + 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." 6.117 fi 6.118 fi 6.119 fi 6.120 @@ -611,7 +611,7 @@ 6.121 fi 6.122 6.123 # Remove previous tarball if no other package needs it. We take care to 6.124 - # keep tarball if the same package use it into main repository. 6.125 + # keep tarball if the same package uses it in the main repository. 6.126 if [ "$TARBALL" ]; then 6.127 previous_tarball=$(grep ^$PACKAGE:incoming $SOURCES_REPOSITORY/sources.list | cut -f2) 6.128 if [ "$previous_tarball" ]; then 6.129 @@ -670,13 +670,13 @@ 6.130 # RAM are available. 6.131 if [ "$freeram" -lt 524288 ] && [ "$CFLAGS" != "${CFLAGS/-pipe}" -o \ 6.132 "$CXXFLAGS" != "${CXXFLAGS/-pipe}" ]; then 6.133 - tazwok_warning "Disabling -pipe compile flag because only ${freeram}b of RAM are available." 6.134 + tazwok_warning "Disabling -pipe compile flag because only ${freeram}b of RAM is available." 6.135 CFLAGS="${CFLAGS/-pipe}" 6.136 CXXFLAGS="${CXXFLAGS/-pipe}" 6.137 fi 6.138 unset freeram 6.139 6.140 - # Set cook environnement variables. 6.141 + # Set cook environement variables. 6.142 [ "$src" ] || set_src_path 6.143 [ "$DESTDIR" ] || DESTDIR="$WOK/$PACKAGE/install" 6.144 [ "$CONFIG_SITE" ] || CONFIG_SITE=/etc/config.site 6.145 @@ -688,18 +688,18 @@ 6.146 compile_rules 6.147 6.148 # Check if config.site has been used. 6.149 - # /!\ disabled since it screw the return_code of the step. 6.150 + # /!\ disabled since it screws the return_code of the step. 6.151 #if [ -f /tmp/config.site ]; then 6.152 # rm /tmp/config.site 6.153 #else 6.154 # tazwok_warning "config.site hasn't been used during \ 6.155 -#configuration process." 6.156 +#the configuration process." 6.157 #fi 6.158 report end-step 6.159 fi 6.160 } 6.161 6.162 -# Check for loop in deps tree. /!\ can be removed 6.163 +# Check for loop in deps tree. /!\ can be removed. 6.164 check_for_deps_loop() 6.165 { 6.166 local list 6.167 @@ -710,7 +710,7 @@ 6.168 [ -n "$1" ] || return 6.169 list="" 6.170 6.171 - # Filter out already processed deps 6.172 + # Filter out already processed deps. 6.173 for i in $@; do 6.174 case " $ALL_DEPS" in 6.175 *\ $i\ *);; 6.176 @@ -752,14 +752,31 @@ 6.177 mkdir $tmp_src 6.178 cd $tmp_src 6.179 if [ "$BRANCH" ]; then 6.180 - git clone $file ${src##*/} && cd ${src##*/} && \ 6.181 + git clone $file ${src##*/} && cd ${src##*/} && \ 6.182 git checkout $BRANCH && rm -rf .git* && break 6.183 else 6.184 git clone $file ${src##*/} && rm -rf ${src##*/}/.git* && break 6.185 fi 6.186 revert_vcs_failure 6.187 else 6.188 - tazwok_warning "Needs git to download the source tarball from $file, please add it as build-depend." 6.189 + tazwok_warning "Needs git to download the source tarball from $file, please add it as a build-depend." 6.190 + continue 6.191 + fi 6.192 + ;; 6.193 + bazaar\|*) 6.194 + file=${file#bazaar|} 6.195 + [ "$COMMAND" = get-src ] && [ ! -f $INSTALLED/bazaar/receipt ] && tazpkg get-install bazaar --forced 6.196 + if [ -f $INSTALLED/bazaar/receipt ]; then 6.197 + mkdir $tmp_src 6.198 + cd $tmp_src 6.199 + if [ "$BRANCH" ]; then 6.200 + bzr co $file -r $BRANCH ${src##*/} && rm -rf ${src##*/}/.bzr* && break 6.201 + else 6.202 + bzr co $file ${src##*/} && rm -rf ${src##*/}/.bzr* && break 6.203 + fi 6.204 + revert_vcs_failure 6.205 + else 6.206 + tazwok_warning "Needs bazaar to download the source tarball from $file, please add it as a build-depend." 6.207 continue 6.208 fi 6.209 ;; 6.210 @@ -776,7 +793,7 @@ 6.211 fi 6.212 revert_vcs_failure 6.213 else 6.214 - tazwok_warning "Needs subversion to download the source tarball from $file, please add it as build-depend." 6.215 + tazwok_warning "Needs subversion to download the source tarball from $file, please add it as a build-depend." 6.216 continue 6.217 fi 6.218 ;; 6.219 @@ -793,7 +810,7 @@ 6.220 fi 6.221 revert_vcs_failure 6.222 else 6.223 - tazwok_warning "Needs mercurial to download the source tarball from $file, please add it as build-depend." 6.224 + tazwok_warning "Needs mercurial to download the source tarball from $file, please add it as a build-depend." 6.225 continue 6.226 fi 6.227 ;; 6.228 @@ -806,7 +823,7 @@ 6.229 wget -q --no-check-certificate $file && break 6.230 fi 6.231 else 6.232 - tazwok_warning "Needs wget to download the source tarball from $file, please add it as build-depend." 6.233 + tazwok_warning "Needs wget to download the source tarball from $file, please add it as a build-depend." 6.234 continue 6.235 fi 6.236 ;; 6.237 @@ -827,13 +844,13 @@ 6.238 done 6.239 } 6.240 6.241 -# Regenerate every package that wants a PACKAGE compiled 6.242 +# Regenerate every package that wants a PACKAGE compiled. 6.243 refresh_packages_from_compile() 6.244 { 6.245 - # make tazwok genpkg happy 6.246 + # make tazwok genpkg happy. 6.247 mkdir $WOK/$PACKAGE/taz 6.248 6.249 - # Cook rwanted in default or specied order 6.250 + # Cook rwanted in default or specied order. 6.251 genlist=" $(look_for_rwanted | tr '\n' ' ') " 6.252 for i in $(look_for_cookopt genpkg | tac); do 6.253 [ "${genlist/ $i }" = "$genlist" ] && continue 6.254 @@ -924,7 +941,7 @@ 6.255 report end-step 6.256 } 6.257 6.258 -# Remove .pyc and .pyo files from packages 6.259 +# Remove .pyc and .pyo files from packages. 6.260 py_compiled_files_remove() 6.261 { 6.262 report step "Removing all .pyc and .pyo files from package ..." 6.263 @@ -937,7 +954,7 @@ 6.264 check_fsh() 6.265 { 6.266 cd $WOK/$PACKAGE/taz/*/fs 6.267 - if [ -z "$(find * -type f)" ] && [ "$CATEGORY" != meta ]; then 6.268 + if [ -z "$(find * ! -type d)" ] && [ "$CATEGORY" != meta ]; then 6.269 echo "$PACKAGE fs is empty." >&2 6.270 cd $WOK/$PACKAGE && rm -rf taz 6.271 return 1 6.272 @@ -997,13 +1014,13 @@ 6.273 { 6.274 grep -q ^$PACKAGE$ $broken || echo $PACKAGE >> $broken 6.275 6.276 - # Remove pkg from cooklist to avoid re-cook it if no changes happens 6.277 + # Remove pkg from cooklist to avoid re-cook it if no changes happen 6.278 # in the cook stuff. 6.279 sed "/^$PACKAGE$/d" -i $cooklist $commit 6.280 6.281 gen_cookmd5 6.282 6.283 - # Return 1 to make report know that's mother-function failed. 6.284 + # Return 1 to make report know that its mother-function failed. 6.285 return 1 6.286 } 6.287 6.288 @@ -1051,7 +1068,7 @@ 6.289 report end-step 6.290 6.291 # Skip generic files for packages with a WANTED variable 6.292 - # (dev and splited pkgs). 6.293 + # (dev and split pkgs). 6.294 if [ ! "$WANTED" ]; then 6.295 copy_generic_files 6.296 fi 6.297 @@ -1113,7 +1130,7 @@ 6.298 [ "$prev_VERSION" ] && pkg_file=$rep/$PACKAGE-$prev_VERSION.tazpkg && break 6.299 done 6.300 if [ "$pkg_file" ]; then 6.301 - report step "Look for major/minor update in libraries" 6.302 + report step "Looking for major/minor updates in libraries" 6.303 get_pkg_files $pkg_file 6.304 cd $WOK/$PACKAGE/taz/$PACKAGE-$VERSION 6.305 fgrep ".so" files.list | egrep -v "[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*" | \ 6.306 @@ -1153,7 +1170,7 @@ 6.307 6.308 # Build cpio archives. Find, cpio and gzip the fs, finish by 6.309 # removing the fs tree. 6.310 - # Don't log this because compression always output error messages. 6.311 + # Don't log this because compression always outputs error messages. 6.312 find fs -print | cpio -o -H newc | case "$PACKAGE-$COMPRESSION" in 6.313 tazpkg-lzma) gzip > fs.cpio.gz;; 6.314 *-lzma) lzma e fs.cpio.lzma -si;; 6.315 @@ -1184,7 +1201,7 @@ 6.316 6.317 # Recook of reverse-depends if package was broken. 6.318 if grep -q "^$PACKAGE$" $broken; then 6.319 - report step "Planning re-try a cook of reverse depends" 6.320 + report step "Planning a re-try cook of reverse depends" 6.321 sed "/^$PACKAGE$/d" -i $broken 6.322 for rdep in $(look_for_rdep); do 6.323 grep -q "^$rdep$" $broken || continue 6.324 @@ -1207,7 +1224,7 @@ 6.325 6.326 ######################################################################## 6.327 # This section contains functions used by several other functions 6.328 -# bellow. 6.329 +# below. 6.330 ######################## 6.331 6.332 # Look for receipt/files.list in wok. If they can't be found, get them 6.333 @@ -1242,7 +1259,7 @@ 6.334 6.335 packages_db_start 6.336 unset RECEIPT 6.337 - report step "Reading datas from all packages" 6.338 + report step "Reading data from all packages" 6.339 for pkg in $(echo $pkg_repository/*.tazpkg | fgrep -v '*'); do 6.340 get_packages_info 6.341 done 6.342 @@ -1319,20 +1336,20 @@ 6.343 packages_db_start() 6.344 { 6.345 if [ -s packages.txt ]; then 6.346 - sed -e 's/^# Packages :.*/# Packages : unknow/' \ 6.347 + sed -e 's/^# Packages :.*/# Packages : unknown/' \ 6.348 -e "s/# Date :.*/# Date : $(date +%Y-%m-%d\ \%H:%M:%S)/" \ 6.349 -i packages.txt 6.350 else 6.351 echo "# SliTaz GNU/Linux - Packages list 6.352 # 6.353 -# Packages : unknow 6.354 +# Packages : unknown 6.355 # Date : $(date +%Y-%m-%d\ \%H:%M:%S) 6.356 # 6.357 " > packages.txt 6.358 fi 6.359 6.360 - # Needed in some case as tazwok define RECEIPT at configuration time 6.361 - # in this particular case it can broke the script. 6.362 + # Needed in some cases as tazwok defines RECEIPT at configuration time 6.363 + # in this particular case it can break the script. 6.364 unset RECEIPT 6.365 6.366 # If $packages_repository is the main one, configure few functions 6.367 @@ -1369,11 +1386,11 @@ 6.368 6.369 get_packages_info() 6.370 { 6.371 - # If there's no taz folder in the wok, extract infos from the 6.372 + # If there's no taz folder in the wok, extract info from the 6.373 # package. 6.374 get_pkg_files $pkg 6.375 source_receipt 6.376 - echo "Getting datas from $PACKAGE" 6.377 + echo "Getting data from $PACKAGE" 6.378 6.379 cat >> $pkg_repository/packages.txt << _EOT_ 6.380 $PACKAGE 6.381 @@ -1392,7 +1409,7 @@ 6.382 # Packages.desc is used by Tazpkgbox <tree>. 6.383 echo "$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE" >> $pkg_repository/packages.desc 6.384 6.385 - # Packages.equiv is used by tazpkg install to check depends 6.386 + # Packages.equiv is used by tazpkg install to check depends. 6.387 for i in $PROVIDE; do 6.388 DEST="" 6.389 echo $i | fgrep -q : && DEST="${i#*:}:" 6.390 @@ -1437,7 +1454,7 @@ 6.391 pkgs=$(wc -l packages.list | sed 's/ .*//') 6.392 sed "s/# Packages : .*/# Packages : $pkgs/" -i packages.txt 6.393 6.394 - # If lists was updated it's generally needed to sort them well. 6.395 + # If lists were updated it's generally needed to sort them well. 6.396 if ! sort -c packages.list 2> /dev/null; then 6.397 report step "Sorting packages lists" 6.398 files_list="packages.list packages.desc packages.equiv" 6.399 @@ -1451,7 +1468,7 @@ 6.400 report end-step 6.401 fi 6.402 6.403 - # Dont log this because lzma always output error. 6.404 + # Dont log this because lzma always output errors. 6.405 lzma e files.list files.list.lzma 6.406 rm -f files.list 6.407 [ -f packages.equiv ] || touch packages.equiv 6.408 @@ -1555,7 +1572,7 @@ 6.409 done 6.410 if [ "$status" = start ]; then 6.411 cp -f $tmp/db /tmp/remain-depends.txt 6.412 - 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 6.413 + 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 6.414 for remaining in $(cut -f 1 $tmp/db); do 6.415 echo "$remaining" >> $blocked 6.416 done 6.417 @@ -1580,7 +1597,7 @@ 6.418 ######################################################################## 6.419 # SCAN CORE 6.420 ######################## 6.421 -# Include various scan core-functions. It's not intended to be used 6.422 +# Includes various scan core-functions. It's not intended to be used 6.423 # directly : prefer scan wrappers in next section. 6.424 6.425 look_for_dep() 6.426 @@ -1863,7 +1880,7 @@ 6.427 } 6.428 6.429 ######################################################################## 6.430 -# This section contains functions to check package repository and 6.431 +# This section contains functions to check the package repository and 6.432 # find which packages to cook. 6.433 ######################## 6.434 6.435 @@ -1900,7 +1917,7 @@ 6.436 # - in the wok/PACKAGE/taz/* folder 6.437 # - in the receipt in the package in incoming repository 6.438 # - in the receipt in the package in packages repository 6.439 - # If md5sum match, there's no commit. 6.440 + # If md5sums match, there's no commit. 6.441 check_for_commit_using_md5sum() 6.442 { 6.443 if [ ! -f $WOK/$PACKAGE/md5 ]; then 6.444 @@ -2034,7 +2051,7 @@ 6.445 fi 6.446 done 6.447 6.448 - # Remaining packages in cooklist are thoses without compile_rules. 6.449 + # Remaining packages in cooklist are those without compile_rules. 6.450 # They can be cooked first in any order. 6.451 if [ -f $tmp/cooklist.tmp ]; then 6.452 cat $tmp/cooklist.tmp >> $tmp/cooklist 6.453 @@ -2060,14 +2077,14 @@ 6.454 6.455 check_for_incoming() 6.456 { 6.457 - report step "Check that all packages were cooked fine" 6.458 + report step "Checking that all packages were cooked OK" 6.459 [ -s $INCOMING_REPOSITORY/packages.desc ] || { 6.460 echo "No packages in $INCOMING_REPOSITORY." 6.461 report end-step; return; } 6.462 if [ -s $broken ]; then 6.463 missingpkg=$(look_for_missing_pkg broken) 6.464 if [ "$missingpkg" ]; then 6.465 - echo "Don't move incoming packages to main repository because theses ones are broken:" >&2 6.466 + echo "Don't move incoming packages to main repository because these ones are broken:" >&2 6.467 echo "$missingpkg" 6.468 report end-step 6.469 return 1 6.470 @@ -2076,7 +2093,7 @@ 6.471 if [ -s $cooklist ]; then 6.472 missingpkg=$(look_for_missing_pkg cooklist) 6.473 if [ "$missingpkg" ]; then 6.474 - echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2 6.475 + echo "Don't move incoming packages to main repository because these ones need to be cooked:" >&2 6.476 echo "$missingpkg" 6.477 report end-step 6.478 return 1 6.479 @@ -2090,7 +2107,7 @@ 6.480 if [ -s $cooklist ]; then 6.481 missingpkg=$(look_for_missing_pkg cooklist) 6.482 if [ "$missingpkg" ]; then 6.483 - echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2 6.484 + echo "Don't move incoming packages to main repository because these ones need to be cooked:" >&2 6.485 echo "$missingpkg" 6.486 report end-step 6.487 return 1 6.488 @@ -2164,7 +2181,7 @@ 6.489 done > flavors.list 6.490 [ -x /usr/bin/clean-chroot ] && clean-chroot 6.491 else 6.492 - echo "Can't create up-to-date flavors because tazlito package is missing." >&2 6.493 + echo "Can't create up-to-date flavors because the tazlito package is missing." >&2 6.494 fi 6.495 report end-step 6.496 } 6.497 @@ -2254,7 +2271,7 @@ 6.498 unset store_pkgname 6.499 6.500 # Upgrade to cooked packages if it was previously installed. 6.501 - report step "Look for package(s) to upgrade" 6.502 + report step "Looking for package(s) to upgrade" 6.503 for pkg in $(look_for_rwanted) $PACKAGE; do 6.504 if [ -f $INSTALLED/$pkg/receipt ]; then 6.505 tazpkg get-install $pkg --forced 6.506 @@ -2278,7 +2295,7 @@ 6.507 [ "$regen_cooklist" ] && unset regen_cooklist && 6.508 [ "$COMMAND" != cook ] && sort_cooklist 6.509 6.510 - # Some hacks to set the bloc & function status as failed if cook was 6.511 + # Some hacks to set the bloc & function status as failed if cook has 6.512 # failed. 6.513 report_return_code=$cook_code 6.514 report close-bloc 6.515 @@ -2291,7 +2308,7 @@ 6.516 { 6.517 if [ -s $tmp/cooklist ]; then 6.518 if [ -f /usr/bin/tazchroot ]; then 6.519 - # Note : options -main variables- are automatically keeped by 6.520 + # Note : options -main variables- are automatically kept by 6.521 # the sub-applications tazchroot/tazwok; as well as report data. 6.522 cd $LOCAL_REPOSITORY 6.523 [ ! -f tazchroot.conf ] && configure_tazchroot 6.524 @@ -2330,8 +2347,8 @@ 6.525 # chroot_dir=/tmp/chroot-${undigest:-$SLITAZ_VERSION} 6.526 chroot_dir=\$LOCAL_REPOSITORY/chroot 6.527 6.528 -# Default scripts path (theses scripts are added in the 6.529 -# $chroot_dir/usr/bin and can be called with tazchroot script) 6.530 +# Default scripts path (these scripts are added to the 6.531 +# $chroot_dir/usr/bin and can be called with tazchroot script). 6.532 script_dir=/usr/lib/slitaz/chroot-scripts/tazwok 6.533 6.534 # List of directories to mount. 6.535 @@ -2355,7 +2372,7 @@ 6.536 $( [ "$undigest" ] && echo ' echo "undigest='"$undigest"'" >> $chroot_dir/etc/slitaz/tazwok.conf') 6.537 sed 's/LC_ALL/LC_ALL=POSIX/' -i \$chroot_dir/etc/profile 6.538 6.539 - # The build bot may run in a sandbox: link sandbox lockfile 6.540 + # The build bot may run in a sandbox: link sandbox lockfile. 6.541 ln -s \$LOCAL_REPOSITORY/sandbox/proc/1 \$chroot_dir/proc/1 6.542 } 6.543 6.544 @@ -2379,10 +2396,10 @@ 6.545 fi 6.546 ) 6.547 echo -e "\${LOCAL_REPOSITORY##*/}-incoming\nmain" > \$chroot_dir\$LOCALSTATE/priority 6.548 - mount -t proc proc \$chroot_dir/proc 6.549 - mount -t sysfs sysfs \$chroot_dir/sys 6.550 - mount -t devpts devpts \$chroot_dir/dev/pts 6.551 - mount -t tmpfs shm \$chroot_dir/dev/shm 6.552 + mount -o bind proc \$chroot_dir/proc 6.553 + mount -o bind sys \$chroot_dir/sys 6.554 + mount -o bind /dev/pts \$chroot_dir/dev/pts 6.555 + mount -o bind /dev/shm \$chroot_dir/dev/shm 6.556 for dir in \$list_dir; do 6.557 mkdir -p \$dir \$chroot_dir\$dir 6.558 mount \$dir \$chroot_dir\$dir 6.559 @@ -2406,7 +2423,7 @@ 6.560 ######################### END OF NEW FUNCTIONS ######################### 6.561 ######################################################################## 6.562 6.563 -# List packages providing a virtual package 6.564 +# List packages providing a virtual package. 6.565 whoprovide() 6.566 { 6.567 local i; 6.568 @@ -2446,7 +2463,7 @@ 6.569 $EDITOR $WOK/$PACKAGE/receipt 6.570 ;; 6.571 build-depends) 6.572 - # List dependencies to rebuild wok, or only a package 6.573 + # List dependencies to rebuild wok, or only a package. 6.574 get_tazwok_config 6.575 report(){ : ; } 6.576 if [ ! "$PACKAGE" ] || [ "$PACKAGE" = toolchain ]; then 6.577 @@ -2472,7 +2489,7 @@ 6.578 gen_cook_list 6.579 ;; 6.580 check-depends) 6.581 - # Check package depends /!\ 6.582 + # Check package depends /!\. 6.583 get_tazwok_config 6.584 echo "" 6.585 echo -e "\033[1mCheck every receipt for DEPENDS - doesn't scan ELF files\033[0m 6.586 @@ -2480,7 +2497,7 @@ 6.587 TMPDIR=/tmp/tazwok$$ 6.588 DEFAULT_DEPENDS="glibc-base gcc-lib-base" 6.589 6.590 - # Build ALL_DEPENDS variable 6.591 + # Build ALL_DEPENDS variable. 6.592 scan_dep() 6.593 { 6.594 local i 6.595 @@ -2500,13 +2517,13 @@ 6.596 done 6.597 } 6.598 6.599 - # Check for ELF file 6.600 + # Check for ELF file. 6.601 is_elf() 6.602 { 6.603 [ "$(dd if=$1 bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ] 6.604 } 6.605 6.606 - # Print shared library dependencies 6.607 + # Print shared library dependencies. 6.608 ldd() 6.609 { 6.610 LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so $1 2> /dev/null 6.611 @@ -2553,7 +2570,7 @@ 6.612 rm -rf $TMPDIR 6.613 ;; 6.614 check) 6.615 - # Check wok consistency 6.616 + # Check wok consistency. 6.617 get_tazwok_config 6.618 echo "" 6.619 echo -e "\033[1mWok and packages checking\033[0m 6.620 @@ -2627,7 +2644,7 @@ 6.621 echo -e "$MSG $i" 6.622 MSG="" 6.623 done 6.624 - MSG="Dependencies loop between $PACKAGE and :\n" 6.625 + MSG="Dependency loop between $PACKAGE and :\n" 6.626 ALL_DEPS="" 6.627 check_for_deps_loop $PACKAGE $DEPENDS 6.628 [ -d $WOK/$pkg/taz ] && for i in $BUILD_DEPENDS; do 6.629 @@ -2795,7 +2812,7 @@ 6.630 check_for_list 6.631 report(){ : ; } 6.632 # When using sort-cooklist, the script should behave as for gen-cooklist 6.633 - # The only difference between theses two is where the output is sended. 6.634 + # The only difference between these two is where the output is sent. 6.635 COMMAND=gen-cooklist 6.636 gen_cook_list 6.637 cp -af $tmp/cooklist $LIST 6.638 @@ -2814,7 +2831,7 @@ 6.639 cook_list 6.640 ;; 6.641 clean) 6.642 - # Clean up a package work directory + thoses which want it. 6.643 + # Clean up a package work directory + those which want it. 6.644 # 6.645 get_tazwok_config 6.646 check_for_package_on_cmdline 6.647 @@ -2855,7 +2872,7 @@ 6.648 echo "" 6.649 ;; 6.650 clean-wok) 6.651 - # Clean all packages in the work directory 6.652 + # Clean all packages in the work directory. 6.653 # 6.654 get_tazwok_config 6.655 source_lib report 6.656 @@ -2887,13 +2904,13 @@ 6.657 exit 1 6.658 fi 6.659 echo "" 6.660 - echo -e "\033[1mObsolete/unrelated-to-wok sourcess :\033[0m" 6.661 + echo -e "\033[1mObsolete/unrelated-to-wok sources :\033[0m" 6.662 horizontal_line 6.663 cat $tmp/obsolete 6.664 horizontal_line 6.665 echo "$(wc -l $tmp/obsolete | cut -f1 -d' ') tarballs to remove." 6.666 echo "" 6.667 - echo -n "Please confirm removing (type uppercase YES): " 6.668 + echo -n "Please confirm before removing (type uppercase YES): " 6.669 read answer 6.670 if [ "$answer" = YES ]; then 6.671 echo -n "Removing old sources..." 6.672 @@ -2999,7 +3016,7 @@ 6.673 status 6.674 # Interactive mode, asking and seding. 6.675 if [ "$3" = "--interactive" ]; then 6.676 - echo "Entering into interactive mode..." 6.677 + echo "Entering interactive mode..." 6.678 echo "================================================================================" 6.679 echo "Package : $PACKAGE" 6.680 # Version. 6.681 @@ -3069,7 +3086,7 @@ 6.682 tazpkg get-install mercurial 6.683 else 6.684 echo "" >&2 6.685 - 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 6.686 + 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 6.687 echo "">&2 6.688 exit 1 6.689 fi 6.690 @@ -3177,7 +3194,7 @@ 6.691 echo "$(wc -l $tmp/tags | cut -f1 -d ' ') tags listed." 6.692 ;; 6.693 check-src) 6.694 - # Verify if upstream package is still available 6.695 + # Verify if upstream package is still available. 6.696 # 6.697 get_tazwok_config 6.698 check_for_package_on_cmdline 6.699 @@ -3324,7 +3341,7 @@ 6.700 cd $LOCAL_REPOSITORY 6.701 configure_tazchroot 6.702 else 6.703 - echo "The packages tazchroot need to be installed" >&2 6.704 + echo "The package tazchroot needs to be installed" >&2 6.705 exit 1 6.706 fi 6.707 ;; 6.708 @@ -3337,7 +3354,7 @@ 6.709 [ ! -f tazchroot.conf ] && configure_tazchroot 6.710 tazchroot 6.711 else 6.712 - echo "The packages tazchroot need to be installed" >&2 6.713 + echo "The package tazchroot needs to be installed" >&2 6.714 exit 1 6.715 fi 6.716 ;; 6.717 @@ -3364,7 +3381,7 @@ 6.718 rm -r $LOCAL_REPOSITORY/chroot 6.719 6.720 else 6.721 - echo -e "\nThe package tazchroot need to be installed.\n" >&2 6.722 + echo -e "\nThe package tazchroot needs to be installed.\n" >&2 6.723 exit 1 6.724 fi 6.725 ;; 6.726 @@ -3384,7 +3401,7 @@ 6.727 [ -d $INSTALLED/$pkg ] || missing="$missing $pkg" 6.728 done 6.729 if [ "$missing" ]; then 6.730 - echo "You need to install those packages to start webserver: $missing." >&2 6.731 + echo "You need to install these packages to start webserver: $missing." >&2 6.732 exit 1 6.733 fi 6.734 if [ ! -f "$LOCAL_REPOSITORY/tazwok.conf" ]; then 6.735 @@ -3427,7 +3444,7 @@ 6.736 [ -L "$WEBSERVER/web" ] || ln -s /usr/share/slitaz/web $WEBSERVER 6.737 echo "WEBSERVER=\"$WEBSERVER\"" >> $LOCAL_REPOSITORY/tazwok.conf 6.738 if [ -L "$WEBSERVER/conf.php" ]; then 6.739 - echo "Do yo want to make ${undigest:-$SLITAZ_VERSION} the default page (y/N) ? " 6.740 + echo "Do you want to make ${undigest:-$SLITAZ_VERSION} the default page (y/N) ? " 6.741 read answer 6.742 if [ "$answer" = y ]; then 6.743 rm $WEBSERVER/conf.php 6.744 @@ -3448,7 +3465,7 @@ 6.745 rm $WEBSERVER/${undigest:-$SLITAZ_VERSION}-${dir##*/} 6.746 done 6.747 if ! [ -s "$WEBSERVER/repositories.list" ]; then 6.748 - 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" 6.749 + 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" 6.750 rm $WEBSERVER/conf.php 6.751 elif [ "$(readlink $WEBSERVER/conf.php)" = "$WEBSERVER/conf-${undigest:-$SLITAZ_VERSION}.php" ]; then 6.752 echo "${undigest:-$SLITAZ_VERSION} was the default version to use; switched to : $(sed 1!d $WEBSERVER/repositories.list)" 6.753 @@ -3466,7 +3483,7 @@ 6.754 check_root 6.755 check_for_package_on_cmdline 6.756 if ! [ -f $WOK/$PACKAGE/receipt ]; then 6.757 - echo "Can't find $PACKAGE into wok." >&2 6.758 + echo "Can't find $PACKAGE in wok." >&2 6.759 echo "" 6.760 exit 1 6.761 fi 6.762 @@ -3492,7 +3509,7 @@ 6.763 check_root 6.764 check_for_package_on_cmdline 6.765 if ! [ -f $WOK/$PACKAGE/receipt ]; then 6.766 - echo "Can't find $PACKAGE into wok." >&2 6.767 + echo "Can't find $PACKAGE in wok." >&2 6.768 echo "" 6.769 exit 1 6.770 fi