SliTaz Repositories

     1.1 --- a/cookiso	Thu Mar 15 03:43:04 2012 +0100
     1.2 +++ b/cookiso	Thu Mar 15 20:52:25 2012 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4  #!/bin/sh
     1.5  #
     1.6 -# Cookiso utility - Build official ISO's in a chroot environment.
     1.7 -# The goal is ti have a tool well integrated to cookutils but who
     1.8 -# can run on it's own and to automate official SliTaz ISO creation.
     1.9 +# Cookiso utility - Build official ISOs in a chroot environment.
    1.10 +# The goal is to have a tool well integrated with cookutils but which
    1.11 +# can run on its own and automate official SliTaz ISO creation.
    1.12  #
    1.13  
    1.14  [ -f "/etc/slitaz/cook.conf" ] && . /etc/slitaz/cook.conf
    1.15 @@ -31,7 +31,7 @@
    1.16  		--pkgdb)
    1.17  			cook pkgdb --flavors ;;
    1.18  		--push)
    1.19 -			echo "TODO: Uplaod iso's to mirror"
    1.20 +			echo "TODO: Upload isos to mirror"
    1.21  			exit 0 ;;
    1.22  		--flavors=*)
    1.23  			flavors=${opt#--flavors=} ;;
    1.24 @@ -70,7 +70,7 @@
    1.25    push          Manually push ISO to a server via SSH.
    1.26    gen           Generate specified flavors.
    1.27    4in1          Generate all 4in1 flavors.
    1.28 -  rolling       Build the rollings ISO's if any changes.
    1.29 +  rolling       Build the rolling ISOs if any changes.
    1.30  
    1.31  $(echo -e "\033[1mOptions:\033[0m")
    1.32    --pkgdb       Generate packages DB before building ISO.
    1.33 @@ -88,7 +88,7 @@
    1.34  	echo ' | \__/ |'
    1.35  }
    1.36  
    1.37 -# Check for one a some flavors on cmdline
    1.38 +# Check for some flavors on cmdline
    1.39  flavors_list() {
    1.40  	if [ "$flavors" == "all" ]; then
    1.41  		flavors=$(ls $SLITAZ/flavors)
    1.42 @@ -127,7 +127,7 @@
    1.43  		echo "Cookiso started: $(date '+%Y-%m-%d %H:%M')" | tee -a $log
    1.44  		tazlito pack-flavor $flavor | tee -a $log
    1.45  		tazlito get-flavor $flavor | tee -a $log
    1.46 -		# BUG: script sometimes screw up conspy on Tank
    1.47 +		# BUG: script sometimes screws up conspy on Tank
    1.48  		script -c "echo -e '\n' | tazlito gen-distro" -a $log
    1.49  		# Rename ISO and md5
    1.50  		mv -f $SLITAZ/distro/slitaz-$flavor.iso $iso/$name.iso
    1.51 @@ -185,20 +185,20 @@
    1.52  		flavors_list
    1.53  		push_iso ;;
    1.54  	gen)
    1.55 -		# Build one or more flavor.
    1.56 +		# Build one or more flavors.
    1.57  		flavors_list
    1.58  		echo -e "\nGenerating flavors:\n$flavors"
    1.59  		gen_flavors ;;
    1.60  	4in1)
    1.61 -		echo -e "\nGenerating 4in1 distro's..."
    1.62 +		echo -e "\nGenerating 4in1 distros..."
    1.63  		flavors="base justx gtkonly core core-4in1"
    1.64  		gen_flavors ;;
    1.65  	rolling)
    1.66  		#
    1.67 -		# Official SliTaz rolling release flavors are automaticaly build.
    1.68 +		# Official SliTaz rolling release flavors are automatically built.
    1.69  		#
    1.70 -		# Check if packages list was modified or if any commit have been
    1.71 -		# done in one the rolling flavors and rebuild ISO's if needed.
    1.72 +		# Check if packages list was modified or if any commits have been
    1.73 +		# done in one of the rolling flavors and rebuild ISOs if needed.
    1.74  		#
    1.75  		pkgs=$SLITAZ/packages/packages.md5
    1.76  		last=$cache/packages.md5
    1.77 @@ -215,7 +215,7 @@
    1.78  		[ -f "$last" ] || cp -f $pkgs $cache
    1.79  		diff $last $pkgs > $diff 
    1.80  		if [ -s "$diff" ]; then
    1.81 -			echo "Found new or rebuilded packages" | log_bot
    1.82 +			echo "Found new or rebuilt packages" | log_bot
    1.83  			cat $diff >> $rollog
    1.84  			#
    1.85  			# TODO: Check new pkg and see if it's part of one of the rolling
    1.86 @@ -245,7 +245,7 @@
    1.87  			do
    1.88  				flavor=$(echo $file | cut -d "/" -f 1)
    1.89  				desc=$(hg log --rev=$rev --template "{desc}" $file)
    1.90 -				echo "Commited flavor  : $flavor - $desc" | log_bot
    1.91 +				echo "Committed flavor  : $flavor - $desc" | log_bot
    1.92  				# Build only rolling flavor
    1.93  				if echo "$cook" | fgrep -q $flavor; then
    1.94  					echo $flavor >> $commits.tmp