tazwok rev 154

Tiny edits
author Paul Issott <paul@slitaz.org>
date Sun Jan 17 18:38:22 2010 +0000 (2010-01-17)
parents c474832ccdb2
children 224b16a6c586
files tazwok
line diff
     1.1 --- a/tazwok	Sat Oct 03 22:32:18 2009 +0200
     1.2 +++ b/tazwok	Sun Jan 17 18:38:22 2010 +0000
     1.3 @@ -354,17 +354,17 @@
     1.4  			echo ""
     1.5  			echo "compilation done : `date +%Y%m%d\ \%H:%M:%S`" >> $LOG
     1.6  
     1.7 -			# Regenerate every package who want PACKAGE compiled
     1.8 +			# Regenerate every package that wants a PACKAGE compiled
     1.9  			# make tazwok genpkg happy
    1.10  			mkdir $WOK/$PACKAGE/taz
    1.11  			for i in $( grep -l "^WANTED=\"$PACKAGE\"" $WOK/*/receipt) ; do
    1.12  				tazwok genpkg $(basename $(dirname $i))
    1.13  			done
    1.14 -			# Still need tazwok genpkg for this package
    1.15 +			# Still needs tazwok genpkg for this package
    1.16  			rm -rf $WOK/$PACKAGE/taz
    1.17  		else
    1.18  			echo "================================================================================"
    1.19 -			echo "Compilation failed. Please read the compilator output."
    1.20 +			echo "Compilation failed. Please read the compiler output."
    1.21  			echo "" && exit 1
    1.22  		fi
    1.23  	else
    1.24 @@ -458,7 +458,7 @@
    1.25  		cat << _EOT_
    1.26  
    1.27  Package will install files in a non standard directory and wont be generated.
    1.28 -You may have a wrong copy path in genpkg_rules or must add some options to
    1.29 +You may have a wrong copy path in genpkg_rules or need to add some options to
    1.30  configure in compile_rules. Some valid options for SliTaz (Linux FSH):
    1.31  
    1.32   --prefix=/usr
    1.33 @@ -533,13 +533,13 @@
    1.34  		echo "No package rules to gen $PACKAGE..."
    1.35  		exit 1
    1.36  	fi
    1.37 -	# Copy the receipt and description (if exists) in the binary package tree.
    1.38 +	# Copy the receipt and description (if exists) into the binary package tree.
    1.39  	cd $WOK/$PACKAGE
    1.40  	echo -n "Copying the receipt..."
    1.41  	cp receipt taz/$PACKAGE-$VERSION
    1.42  	status
    1.43  	if grep -q ^get_version $RECEIPT; then
    1.44 -		echo -n "Update version in receipt..."
    1.45 +		echo -n "Updating version in receipt..."
    1.46  		sed -i "s/^VERSION=.*/VERSION=\"$VERSION\"/" \
    1.47  			taz/$PACKAGE-$VERSION/receipt
    1.48  		status
    1.49 @@ -611,7 +611,7 @@
    1.50  	echo -n "Creating full cpio archive... "
    1.51  	find . -print | cpio -o -H newc > $PACKAGES_REPOSITORY/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg
    1.52  	status
    1.53 -	# Restore package tree incase we want to browse it.
    1.54 +	# Restore package tree in case we want to browse it.
    1.55  	echo -n "Restoring original package tree... "
    1.56  	( zcat fs.cpio.gz 2> /dev/null || unlzma -c fs.cpio.lzma ) | cpio -id
    1.57  	rm fs.cpio.* && cd ..
    1.58 @@ -843,7 +843,7 @@
    1.59  		rm -rf $TMPDIR
    1.60  		;;
    1.61  	check)
    1.62 -		# Check wok consistancy
    1.63 +		# Check wok consistency
    1.64  		echo ""
    1.65  		echo -e "\033[1mWok and packages checking\033[0m
    1.66  ================================================================================"
    1.67 @@ -933,7 +933,7 @@
    1.68  			check_for_deps_loop $PACKAGE $DEPENDS
    1.69  			[ -d $WOK/$pkg/taz ] && for i in $BUILD_DEPENDS; do
    1.70  				[ $WOK/$pkg/taz -nt $INSTALLED/$i/files.list ] && continue
    1.71 -				echo "$pkg should be rebuilt since $i installation"
    1.72 +				echo "$pkg should be rebuilt after $i installation"
    1.73  			done
    1.74  		done
    1.75  		;;
    1.76 @@ -1342,7 +1342,7 @@
    1.77  		status
    1.78  		# Interactive mode, asking and seding.
    1.79  		if [ "$3" = "--interactive" ]; then
    1.80 -			echo "Entering in interactive mode..."
    1.81 +			echo "Entering into interactive mode..."
    1.82  			echo "================================================================================"
    1.83  			echo "Package       : $PACKAGE"
    1.84  			# Version.