SliTaz Repositories

     1.1 --- a/cooker	Sat May 07 11:18:47 2011 +0100
     1.2 +++ b/cooker	Sat May 07 12:05:34 2011 +0100
     1.3 @@ -2,8 +2,8 @@
     1.4  #
     1.5  # SliTaz Build Bot. The Cooker is a tool to automate and test SliTaz package 
     1.6  # building. Please read the Cookbook documentation for more information 
     1.7 -# and put talk to AUTHORS before adding anything here. PS: no translation
     1.8 -# here since it's not a end user tool and it's not usfull, all devs should
     1.9 +# and discuss with the AUTHORS before adding anything here. PS: no translations
    1.10 +# here since it's not an end user tool and it's not useful, all devs should
    1.11  # at least understand basic English.
    1.12  #
    1.13  
    1.14 @@ -43,7 +43,7 @@
    1.15    unblock|-ub     Unblock a blocked package.
    1.16    pkg|-p          Same as 'cook pkg' but with cooker log.
    1.17    flavor|-f       Cook all packages of a flavor.
    1.18 -  list|-l         Cook all package in the given list.
    1.19 +  list|-l         Cook all packages in the given list.
    1.20    cat|-c          Cook all packages of a category.
    1.21    all|-a          Find and cook all unbuilt packages.
    1.22  
    1.23 @@ -65,7 +65,7 @@
    1.24  		sed s"#^[A-Z]\([^']*\)#$(date '+%Y-%m-%d %H:%M') : \0#" >> $activity
    1.25  }
    1.26  
    1.27 -# Some message goes in activity but log verbose output when checking for commits
    1.28 +# Some messages occur in activity but log verbose output when checking for commits
    1.29  # into a log file.
    1.30  log_commits() {
    1.31  	sed '/^.\//'d | sed '/^.hg/'d | tee -a $LOGS/commits.log
    1.32 @@ -76,7 +76,7 @@
    1.33  	echo "$pkg" >> $broken
    1.34  }
    1.35  
    1.36 -# Clean up after cook sucess.
    1.37 +# Clean up after cook success.
    1.38  empty_command() {
    1.39  	rm -f $command && touch $command
    1.40  }
    1.41 @@ -94,7 +94,7 @@
    1.42  	echo "Check date       : $(date '+%Y-%m-%d %H:%M')"
    1.43  }
    1.44  
    1.45 -# Scan packages build deps an fill up cookorder list.
    1.46 +# Scan packages build deps and fill up cookorder list.
    1.47  cook_order_scan() {
    1.48  	touch $cooklist $cookorder
    1.49  	for pkg in $(cat $cooklist)
    1.50 @@ -114,7 +114,7 @@
    1.51  		done
    1.52  	done
    1.53  	
    1.54 -	# Append unordered packages to cookored.
    1.55 +	# Append unordered packages to cookorder.
    1.56  	for pkg in $(cat $cooklist)
    1.57  	do
    1.58  		if ! grep -q "^$pkg$" $cookorder; then
    1.59 @@ -123,7 +123,7 @@
    1.60  	done
    1.61  }
    1.62  
    1.63 -# Scan and rescan untill the cooklist is ordered then handle WANTED.
    1.64 +# Scan and rescan until the cooklist is ordered then handle WANTED.
    1.65  cook_order() {
    1.66  	time=$(date +%s)
    1.67  	scan=0
    1.68 @@ -154,7 +154,7 @@
    1.69  	diff $cooklist.0 $cooklist > $cooklist.diff
    1.70  	rm -f $cookorder $cookorder.diff $cooklist.0
    1.71  
    1.72 -	# Scan is finish: append pkg to WANTED
    1.73 +	# Scan is finished: append pkg to WANTED
    1.74  	echo -e "\nHandle WANTED package"
    1.75  	separator
    1.76  	for pkg in $(cat $cooklist)
    1.77 @@ -193,7 +193,7 @@
    1.78  	done && sed -i /^$/d $cooklist
    1.79  }
    1.80  
    1.81 -# Uses in default mode and with all cmd.
    1.82 +# Use in default mode and with all cmd.
    1.83  cook_commits() {
    1.84  	if [ -s "$commits" ]; then
    1.85  		for pkg in $(cat $commits)
    1.86 @@ -206,7 +206,7 @@
    1.87  	fi
    1.88  }
    1.89  
    1.90 -# Cook all package in a cooklist.
    1.91 +# Cook all packages in a cooklist.
    1.92  cook_list() {
    1.93  	for pkg in $(cat $cooklist)
    1.94  	do
    1.95 @@ -234,9 +234,9 @@
    1.96  			[ ! -d "$INSTALLED/$pkg" ] && tazpkg get-install $pkg
    1.97  		done
    1.98  		mkdir -p $SLITAZ && cd $SLITAZ
    1.99 -		[ -d "${wok}-hg" ] && echo -e "Hg wok already exist.\n" && exit 1
   1.100 -		[ -d "$wok" ] && echo -e "Build wok already exist.\n" && exit 1
   1.101 -		[ -d "$flavors" ] && echo -e "Flavors repo already exist.\n" && exit 1
   1.102 +		[ -d "${wok}-hg" ] && echo -e "Hg wok already exists.\n" && exit 1
   1.103 +		[ -d "$wok" ] && echo -e "Build wok already exists.\n" && exit 1
   1.104 +		[ -d "$flavors" ] && echo -e "Flavors repo already exists.\n" && exit 1
   1.105  
   1.106  		# Directories and files
   1.107  		echo "mkdir's and touch files in: $SLITAZ"
   1.108 @@ -250,7 +250,7 @@
   1.109  		cp -a ${wok}-hg $wok
   1.110  		separator && echo "" ;;
   1.111  	note|-n)
   1.112 -		# Blocked a pkg and want other to know why ? Post a note!
   1.113 +		# Blocked a pkg and want others to know why ? Post a note!
   1.114  		note="$2"
   1.115  		date=$(date "+%Y-%m-%d %H:%M")
   1.116  		[ "$note" ] && echo "$date : $note" >> $cooknotes ;;
   1.117 @@ -267,8 +267,8 @@
   1.118  		# Unblock a package.
   1.119  		[ "$pkg" ] && cook $pkg --unblock ;;
   1.120  	reverse|-r)
   1.121 -		# Cook all reverse dependencies for a packages. This command let us
   1.122 -		# control the Cooker manually for commit that will cook a lot of packages.
   1.123 +		# Cook all reverse dependencies for a package. This command lets us
   1.124 +		# control the Cooker manually for commits that will cook a lot of packages.
   1.125  		#
   1.126  		# Use hg commit ? Ex: hg commit -m "Message bla bla | cooker:reverse"
   1.127  		#
   1.128 @@ -315,7 +315,7 @@
   1.129  		cook_order | tee $LOGS/cookorder.log
   1.130  		cook_list ;;
   1.131  	list|-l)
   1.132 -		# Cook a list og package given in argument.
   1.133 +		# Cook a list of packages given in argument.
   1.134  		list="$2"
   1.135  		[ ! -f "$list" ] && \
   1.136  			echo -e "\nSpecified list does not exist: $list\n" && exit 1
   1.137 @@ -361,7 +361,7 @@
   1.138  		[ -f "${wok}-hg/.hg/hgrc" ] && cd ${wok}-hg && hg pull -u | log_commits
   1.139  		new=$(hg head --template '{rev}\n')
   1.140  		
   1.141 -		# Sync build wok with rsync so we dont take care about removing old
   1.142 +		# Sync build wok with rsync so we don't take care about removing old
   1.143  		# files as before.
   1.144  		if [ "$new" -gt "$cur" ]; then
   1.145  			echo "Changes found from: $cur to $new" | log
   1.146 @@ -391,7 +391,7 @@
   1.147  			done
   1.148  		done
   1.149  		
   1.150 -		# Keep previews commit and discard duplicate lines
   1.151 +		# Keep previous commit and discard duplicate lines
   1.152  		cat $commits $commits.tmp | sed /"^$"/d > $commits.new
   1.153  		uniq $commits.new > $commits && rm $commits.*
   1.154  		echo "Packages to cook : $(cat $commits | wc -l)" | log_commits