SliTaz Repositories

     1.1 --- a/README	Thu Mar 15 00:07:00 2012 -0300
     1.2 +++ b/README	Thu Mar 15 20:52:25 2012 +0000
     1.3 @@ -96,15 +96,15 @@
     1.4  
     1.5  Cookiso
     1.6  -------------------------------------------------------------------------------
     1.7 -Cookiso the the official tool to automate the ISO build. The goal is to provide
     1.8 -a simple to use, rock solid tool with a web interface à la Cooker. It share
     1.9 -configuration and template with the Cooker but can be run on it's own so it
    1.10 +Cookiso is the official tool to automate the ISO build. The goal is to provide
    1.11 +a simple to use, rock solid tool with a web interface à la Cooker. It shares
    1.12 +configuration and templates with the Cooker but can be run on its own so it
    1.13  can be used by contributors or customers to automate custom ISO building.
    1.14 -Cookiso must be run in a chroot wich can be the same chroot tan the Cooker.
    1.15 +Cookiso must be run in a chroot which can be the same chroot as the Cooker.
    1.16  
    1.17 -Cookiso is also used to build rolling ISO by tracking changes in packages
    1.18 -list or a Hg repository. The rolling command is designed to be run by cron
    1.19 -in a chroot environment. Here is some usage examples:
    1.20 +Cookiso is also used to build rolling ISOs by tracking changes in a packages
    1.21 +list or Hg repository. The rolling command is designed to be run by cron
    1.22 +in a chroot environment. Here are some usage examples:
    1.23  
    1.24  # cookiso setup
    1.25  # cookiso gen --flavors="base justx"

     2.1 --- a/cookiso	Thu Mar 15 00:07:00 2012 -0300
     2.2 +++ b/cookiso	Thu Mar 15 20:52:25 2012 +0000
     2.3 @@ -1,8 +1,8 @@
     2.4  #!/bin/sh
     2.5  #
     2.6 -# Cookiso utility - Build official ISO's in a chroot environment.
     2.7 -# The goal is ti have a tool well integrated to cookutils but who
     2.8 -# can run on it's own and to automate official SliTaz ISO creation.
     2.9 +# Cookiso utility - Build official ISOs in a chroot environment.
    2.10 +# The goal is to have a tool well integrated with cookutils but which
    2.11 +# can run on its own and automate official SliTaz ISO creation.
    2.12  #
    2.13  
    2.14  [ -f "/etc/slitaz/cook.conf" ] && . /etc/slitaz/cook.conf
    2.15 @@ -31,7 +31,7 @@
    2.16  		--pkgdb)
    2.17  			cook pkgdb --flavors ;;
    2.18  		--push)
    2.19 -			echo "TODO: Uplaod iso's to mirror"
    2.20 +			echo "TODO: Upload isos to mirror"
    2.21  			exit 0 ;;
    2.22  		--flavors=*)
    2.23  			flavors=${opt#--flavors=} ;;
    2.24 @@ -70,7 +70,7 @@
    2.25    push          Manually push ISO to a server via SSH.
    2.26    gen           Generate specified flavors.
    2.27    4in1          Generate all 4in1 flavors.
    2.28 -  rolling       Build the rollings ISO's if any changes.
    2.29 +  rolling       Build the rolling ISOs if any changes.
    2.30  
    2.31  $(echo -e "\033[1mOptions:\033[0m")
    2.32    --pkgdb       Generate packages DB before building ISO.
    2.33 @@ -88,7 +88,7 @@
    2.34  	echo ' | \__/ |'
    2.35  }
    2.36  
    2.37 -# Check for one a some flavors on cmdline
    2.38 +# Check for some flavors on cmdline
    2.39  flavors_list() {
    2.40  	if [ "$flavors" == "all" ]; then
    2.41  		flavors=$(ls $SLITAZ/flavors)
    2.42 @@ -127,7 +127,7 @@
    2.43  		echo "Cookiso started: $(date '+%Y-%m-%d %H:%M')" | tee -a $log
    2.44  		tazlito pack-flavor $flavor | tee -a $log
    2.45  		tazlito get-flavor $flavor | tee -a $log
    2.46 -		# BUG: script sometimes screw up conspy on Tank
    2.47 +		# BUG: script sometimes screws up conspy on Tank
    2.48  		script -c "echo -e '\n' | tazlito gen-distro" -a $log
    2.49  		# Rename ISO and md5
    2.50  		mv -f $SLITAZ/distro/slitaz-$flavor.iso $iso/$name.iso
    2.51 @@ -185,20 +185,20 @@
    2.52  		flavors_list
    2.53  		push_iso ;;
    2.54  	gen)
    2.55 -		# Build one or more flavor.
    2.56 +		# Build one or more flavors.
    2.57  		flavors_list
    2.58  		echo -e "\nGenerating flavors:\n$flavors"
    2.59  		gen_flavors ;;
    2.60  	4in1)
    2.61 -		echo -e "\nGenerating 4in1 distro's..."
    2.62 +		echo -e "\nGenerating 4in1 distros..."
    2.63  		flavors="base justx gtkonly core core-4in1"
    2.64  		gen_flavors ;;
    2.65  	rolling)
    2.66  		#
    2.67 -		# Official SliTaz rolling release flavors are automaticaly build.
    2.68 +		# Official SliTaz rolling release flavors are automatically built.
    2.69  		#
    2.70 -		# Check if packages list was modified or if any commit have been
    2.71 -		# done in one the rolling flavors and rebuild ISO's if needed.
    2.72 +		# Check if packages list was modified or if any commits have been
    2.73 +		# done in one of the rolling flavors and rebuild ISOs if needed.
    2.74  		#
    2.75  		pkgs=$SLITAZ/packages/packages.md5
    2.76  		last=$cache/packages.md5
    2.77 @@ -215,7 +215,7 @@
    2.78  		[ -f "$last" ] || cp -f $pkgs $cache
    2.79  		diff $last $pkgs > $diff 
    2.80  		if [ -s "$diff" ]; then
    2.81 -			echo "Found new or rebuilded packages" | log_bot
    2.82 +			echo "Found new or rebuilt packages" | log_bot
    2.83  			cat $diff >> $rollog
    2.84  			#
    2.85  			# TODO: Check new pkg and see if it's part of one of the rolling
    2.86 @@ -245,7 +245,7 @@
    2.87  			do
    2.88  				flavor=$(echo $file | cut -d "/" -f 1)
    2.89  				desc=$(hg log --rev=$rev --template "{desc}" $file)
    2.90 -				echo "Commited flavor  : $flavor - $desc" | log_bot
    2.91 +				echo "Committed flavor  : $flavor - $desc" | log_bot
    2.92  				# Build only rolling flavor
    2.93  				if echo "$cook" | fgrep -q $flavor; then
    2.94  					echo $flavor >> $commits.tmp

     3.1 --- a/web/cookiso.cgi	Thu Mar 15 00:07:00 2012 -0300
     3.2 +++ b/web/cookiso.cgi	Thu Mar 15 20:52:25 2012 +0000
     3.3 @@ -43,7 +43,7 @@
     3.4  	done
     3.5  }
     3.6  
     3.7 -# xHTML header. Pages can be customized with a separated html.header file.
     3.8 +# xHTML header. Pages can be customized with a separate html.header file.
     3.9  if [ -f "header.html" ]; then
    3.10  	cat header.html | sed s'/Cooker/ISO Cooker/'
    3.11  else