tazwok rev 82
Fix typos
| author | Mike D. Smith <MikeDSmith25@gmail.com> |
|---|---|
| date | Sat Jul 19 05:46:08 2008 +0000 (2008-07-19) |
| parents | 353938a9dc59 |
| children | c55016507431 |
| files | README tazwok |
line diff
1.1 --- a/README Wed Jul 16 16:11:12 2008 +0200 1.2 +++ b/README Sat Jul 19 05:46:08 2008 +0000 1.3 @@ -4,15 +4,15 @@ 1.4 1.5 English 1.6 ------- 1.7 -Tazwok can compile source package and creat binary packages suitable for 1.8 -Tazpkg (Tiny autonomus zone package manager). You can build individuals 1.9 -package or a list a packages with one command, rebuild the full distro, 1.10 +Tazwok can compile source packages and create binary packages suitable for 1.11 +Tazpkg (Tiny autonomous zone package manager). You can build individual 1.12 +packages or a list of packages with one command, rebuild the full distro, 1.13 generate a packages repository and also list and get info about packages. 1.14 -Please check 'tazwok usgae' to get a list of commands with a short 1.15 +Please check 'tazwok usage' to get a list of commands with a short 1.16 description in English. 1.17 1.18 -Tazwok is a SHell script written from scratch, work with Bash, and Ash from 1.19 -the Busybox. Tazwok is licensed under free GNU gpl v3. See INSTALL at the 1.20 +Tazwok is a SHell script written from scratch, that works with Bash, and Ash 1.21 +from Busybox. Tazwok is licensed under free GNU gpl v3. See INSTALL at the 1.22 bottom of this file for installation instructions. 1.23 1.24
2.1 --- a/tazwok Wed Jul 16 16:11:12 2008 +0200 2.2 +++ b/tazwok Sat Jul 19 05:46:08 2008 +0000 2.3 @@ -1,9 +1,9 @@ 2.4 #!/bin/sh 2.5 # Tazwok - SliTaz source compiler and binary packages generator/cooker. 2.6 # 2.7 -# Tazwok can compile source package and creat binary packages suitable for 2.8 -# Tazpkg (Tiny Autonomus zone package manager). You can build individuals 2.9 -# package or a list a packages with one command, rebuild the full distro, 2.10 +# Tazwok can compile source packages and create binary packages suitable for 2.11 +# Tazpkg (Tiny Autonomous zone package manager). You can build individual 2.12 +# packages or a list of packages with one command, rebuild the full distro, 2.13 # generate a packages repository and also list and get info about packages. 2.14 # 2.15 # (C) 2007-2008 SliTaz - GNU General Public License. 2.16 @@ -30,13 +30,12 @@ 2.17 meta 2.18 non-free" 2.19 2.20 -# Use words rater than numbers in the code. 2.21 +# Use words rather than numbers in the code. 2.22 COMMAND=$1 2.23 PACKAGE=$2 2.24 LIST=$2 2.25 2.26 -# Include config file or exit if any file found. 2.27 - 2.28 +# Include config file or exit if no file found. 2.29 if [ -f "./tazwok.conf" ]; then 2.30 . ./tazwok.conf 2.31 elif [ -f "/etc/tazwok.conf" ]; then 2.32 @@ -47,7 +46,7 @@ 2.33 exit 0 2.34 fi 2.35 2.36 -# Creat Taz wok needed directories if user is root. 2.37 +# Create Taz wok needed directories if user is root. 2.38 if test $(id -u) = 0 ; then 2.39 # Check for the wok directory. 2.40 if [ ! -d "$WOK" ]; then 2.41 @@ -69,7 +68,7 @@ 2.42 2.43 # The path to the most important file used by Tazwok. 2.44 # The receipt is used to compile the source code and 2.45 -# gen suitables packages for Tazpkg. 2.46 +# generate suitable packages for Tazpkg. 2.47 RECEIPT="$WOK/$PACKAGE/receipt" 2.48 2.49 # The path to the process log file. 2.50 @@ -89,16 +88,16 @@ 2.51 stats Print Tazwok statistics from the config file and the wok. 2.52 cmp|compare Compare the wok and the cooked pkgs (--remove old pkgs). 2.53 list List all packages in the wok tree or by category. 2.54 - info Get informations about a package in the wok. 2.55 + info Get information about a package in the wok. 2.56 check-log Check the process log file of a package. 2.57 search Search for a package in the wok by pattern or name. 2.58 - compile Configure and build the package using the receipt rules. 2.59 + compile Configure and build a package using the receipt rules. 2.60 genpkg Generate a suitable package for Tazpkg with the rules. 2.61 cook Compile and generate a package directly. 2.62 cook-list Cook all packages specified in the list by order. 2.63 clean Clean all generated files in the package tree. 2.64 new-tree Prepare a new package tree and receipt (--interactive). 2.65 - gen-list Generate a packages lists for a repository (--text). 2.66 + gen-list Generate a packages list for a repository (--text). 2.67 gen-clean-wok Gen a clean wok in a dir ('clean-wok' cleans current wok). 2.68 remove Remove a package from the wok.\n" 2.69 } 2.70 @@ -152,7 +151,7 @@ 2.71 echo -e "\nPlease specify the path to the list of packages to cook.\n" 2.72 exit 0 2.73 fi 2.74 - # Check if the list of packages exist. 2.75 + # Check if the list of packages exists. 2.76 if [ -f "$LIST" ]; then 2.77 LIST=`cat $LIST` 2.78 else 2.79 @@ -302,8 +301,8 @@ 2.80 echo -n "Source tarball exit... " 2.81 status 2.82 fi 2.83 - # Untaring source if necessary. We dont need to extract source if 2.84 - # the package is build with a wanted source package. 2.85 + # Untaring source if necessary. We don't need to extract source if 2.86 + # the package is built with a wanted source package. 2.87 if [ "$WANTED" = "" ]; then 2.88 if [ ! -d $src ]; then 2.89 # Log process. 2.90 @@ -325,8 +324,8 @@ 2.91 fi 2.92 fi 2.93 cd $WOK/$PACKAGE 2.94 - # Log and execute compile_rules function if it exist, to configure and 2.95 - # make the package if it exist. 2.96 + # Log and execute compile_rules function if it exists, to configure and 2.97 + # make the package if it exists. 2.98 if grep -q ^compile_rules $RECEIPT; then 2.99 echo "executing compile_rules" >> $LOG 2.100 compile_rules 2.101 @@ -349,12 +348,12 @@ 2.102 fi 2.103 } 2.104 2.105 -# Copy all generic files (locale, pixmaps, .desktop). We use standard path, 2.106 +# Copy all generic files (locale, pixmaps, .desktop). We use standard paths, 2.107 # so some packages need to copy these files with the receipt and genpkg_rules. 2.108 # This function is executed by gen_package when 'tazwok genpkg'. 2.109 copy_generic_files() 2.110 { 2.111 - # In most case locale are in $_pkg/usr/share/locale so we copy files 2.112 + # In most cases, locales are in $_pkg/usr/share/locale so we copy files 2.113 # using generic variables and $LOCALE from Tazwok config file. 2.114 if [ ! "$LOCALE" = "" ]; then 2.115 if [ -d "$_pkg/usr/share/locale" ]; then 2.116 @@ -367,8 +366,8 @@ 2.117 done 2.118 fi 2.119 fi 2.120 - # Pixmaps (PNG or/and XPM only). Some icons/images can be add trough 2.121 - # genpkg_rules and generic copy can be disable with GENERIC_PIXMAPS="no" 2.122 + # Pixmaps (PNG or/and XPM only). Some icons/images can be added through 2.123 + # genpkg_rules and generic copy can be disabled with GENERIC_PIXMAPS="no" 2.124 # in pkg receipt. 2.125 if [ ! "$GENERIC_PIXMAPS" = "no" ]; then 2.126 if [ -d "$_pkg/usr/share/pixmaps" ]; then 2.127 @@ -378,7 +377,7 @@ 2.128 cp -a $_pkg/usr/share/pixmaps/$PACKAGE.xpm \ 2.129 $fs/usr/share/pixmaps 2>/dev/null 2.130 fi 2.131 - # Custom or home made PNG pixmap can be in stuff. 2.132 + # Custom or homemade PNG pixmap can be in stuff. 2.133 if [ -f "stuff/$PACKAGE.png" ]; then 2.134 mkdir -p $fs/usr/share/pixmaps 2.135 cp -a stuff/$PACKAGE.png $fs/usr/share/pixmaps 2.136 @@ -388,7 +387,7 @@ 2.137 if [ -d "$_pkg/usr/share/applications" ]; then 2.138 cp -a $_pkg/usr/share/applications $fs/usr/share 2.139 fi 2.140 - # Home made desktop file(s) can be in stuff. 2.141 + # Homemade desktop file(s) can be in stuff. 2.142 if [ -d "stuff/applications" ]; then 2.143 mkdir -p $fs/usr/share 2.144 cp -a stuff/applications $fs/usr/share 2.145 @@ -416,7 +415,7 @@ 2.146 status 2.147 } 2.148 2.149 -# Creat a package tree and build the gziped cpio archive 2.150 +# Create a package tree and build the gziped cpio archive 2.151 # to make a SliTaz (.tazpkg) package. 2.152 gen_package() 2.153 { 2.154 @@ -432,10 +431,10 @@ 2.155 rm -rf taz 2.156 rm -f $PACKAGES_REPOSITORY/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg 2.157 fi 2.158 - # Creat the package tree and set usful variables. 2.159 + # Create the package tree and set useful variables. 2.160 mkdir -p taz/$PACKAGE-$VERSION/fs 2.161 fs=taz/$PACKAGE-$VERSION/fs 2.162 - # Set $src for standards package and $_pkg variables. 2.163 + # Set $src for standard package and $_pkg variables. 2.164 if [ "$WANTED" = "" ]; then 2.165 src=$WOK/$PACKAGE/$PACKAGE-$VERSION 2.166 _pkg=$src/_pkg 2.167 @@ -466,7 +465,7 @@ 2.168 echo "No package rules to gen $PACKAGE..." 2.169 exit 1 2.170 fi 2.171 - # Copy the receipt and description (if exist) in the binary package tree. 2.172 + # Copy the receipt and description (if exists) in the binary package tree. 2.173 cd $WOK/$PACKAGE 2.174 echo -n "Copying the receipt..." 2.175 cp receipt taz/$PACKAGE-$VERSION 2.176 @@ -476,7 +475,7 @@ 2.177 cp description.txt taz/$PACKAGE-$VERSION 2.178 status 2.179 fi 2.180 - # Creat the files.list by redirecting find outpout. 2.181 + # Create the files.list by redirecting find output. 2.182 echo -n "Creating the list of files..." 2.183 cd taz/$PACKAGE-$VERSION 2.184 LAST_FILE="" 2.185 @@ -521,7 +520,7 @@ 2.186 fi 2.187 echo -n "Creating full cpio archive... " 2.188 find . -print | cpio -o -H newc > $PACKAGES_REPOSITORY/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg 2.189 - # Restore package tree in case we want to browse it. 2.190 + # Restore package tree incase we want to browse it. 2.191 echo -n "Restoring original package tree... " 2.192 zcat fs.cpio.gz | cpio -id 2.193 rm fs.cpio.gz && cd .. 2.194 @@ -566,7 +565,7 @@ 2.195 $PACKED_SIZE ($UNPACKED_SIZE installed) 2.196 _EOT_ 2.197 fi 2.198 - # packages.desv is used by Tazpkgbox <tree>. 2.199 + # packages.desc is used by Tazpkgbox <tree>. 2.200 echo "$PACKAGE | $VERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE" >> packages.desc 2.201 packages=$(($packages+1)) 2.202 done && status 2.203 @@ -645,10 +644,10 @@ 2.204 done 2.205 ;; 2.206 cmp|compare) 2.207 - # Compare the wok and packages repository to help maintaining 2.208 + # Compare the wok and packages repository to help with maintaining 2.209 # a mirror. 2.210 echo "" 2.211 - echo -e "\033[1mWok and packages comparaison\033[0m 2.212 + echo -e "\033[1mWok and packages comparison\033[0m 2.213 ================================================================================" 2.214 for pkg in $WOK/* 2.215 do 2.216 @@ -667,7 +666,7 @@ 2.217 ${i%.tazpkg}*.tazpkg) continue 2;; 2.218 esac 2.219 done 2.220 - # not found 2.221 + # Not found 2.222 echo $pkg >> /tmp/pkgs.old 2.223 if [ "$2" = "--remove" ]; then 2.224 echo "Removing package: $pkg" 2.225 @@ -723,17 +722,17 @@ 2.226 packages=$(($packages+1)) 2.227 done 2.228 echo "================================================================================" 2.229 - echo -e "$packages packages avalaible in the wok.\n" 2.230 + echo -e "$packages packages available in the wok.\n" 2.231 fi 2.232 ;; 2.233 info) 2.234 - # Informations about package. 2.235 + # Information about a package. 2.236 # 2.237 check_for_package_on_cmdline 2.238 check_for_receipt 2.239 . $WOK/$PACKAGE/receipt 2.240 echo "" 2.241 - echo -e "\033[1mTazwok package informations\033[0m 2.242 + echo -e "\033[1mTazwok package information\033[0m 2.243 ================================================================================ 2.244 Package : $PACKAGE 2.245 Version : $VERSION 2.246 @@ -757,7 +756,7 @@ 2.247 # We just cat the file log to view process info. 2.248 # 2.249 if [ ! -f "$LOG" ]; then 2.250 - echo -e "\nNo process log found. The package is probably not cook.\n" 2.251 + echo -e "\nNo process log found. The package is probably not cooked.\n" 2.252 exit 0 2.253 else 2.254 echo "" 2.255 @@ -836,7 +835,7 @@ 2.256 if grep -q ^clean_wok $RECEIPT; then 2.257 clean_wok 2.258 fi 2.259 - # Remove taz/ and source tree if exist. 2.260 + # Remove taz/ and source tree if exists. 2.261 if [ -d "taz" ]; then 2.262 echo -n "Removing taz files..." 2.263 rm -rf taz && status 2.264 @@ -925,13 +924,13 @@ 2.265 fi 2.266 fi 2.267 cd $PACKAGES_REPOSITORY 2.268 - # Remove old packages.list and md5sum, it well be soon rebuild. 2.269 + # Remove old packages.list and md5sum, they will soon be rebuilt. 2.270 rm -f packages.list packages.md5 packages.txt 2.271 echo "" 2.272 echo -e "\033[1mGenerating packages lists\033[0m" 2.273 echo "================================================================================" 2.274 echo -n "Repository path : $PACKAGES_REPOSITORY" && status 2.275 - # Gen packages.txt 2.276 + # Generate packages.txt 2.277 if [ "$textlist" == "yes" ]; then 2.278 gen_textlist 2.279 fi 2.280 @@ -949,12 +948,12 @@ 2.281 echo "" 2.282 ;; 2.283 new-tree) 2.284 - # Just creat a few directories and gen a empty receipt to prepare 2.285 + # Just create a few directories and generate an empty receipt to prepare 2.286 # the creation of a new package. 2.287 # 2.288 check_for_package_on_cmdline 2.289 if [ -d $WOK/$PACKAGE ]; then 2.290 - echo -e "\n$PACKAGE package tree already exist.\n" 2.291 + echo -e "\n$PACKAGE package tree already exists.\n" 2.292 exit 0 2.293 fi 2.294 echo "Creating : $WOK/$PACKAGE" 2.295 @@ -1053,7 +1052,7 @@ 2.296 echo "" 2.297 ;; 2.298 usage|*) 2.299 - # Print usage also for all unknow commands. 2.300 + # Print usage also for all unknown commands. 2.301 # 2.302 usage 2.303 ;;