cookutils rev 1148

cook: typo
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Nov 09 15:36:25 2021 +0000 (2021-11-09)
parents dc3ff2ae7314
children 3bb03a355277
files cook cook.conf cooker cookiso doc/cross.txt init.d/cooker lib/libcook.sh lighttpd/index.cgi modules/compressor
line diff
     1.1 --- a/cook	Sun Aug 02 12:49:31 2020 +0000
     1.2 +++ b/cook	Tue Nov 09 15:36:25 2021 +0000
     1.3 @@ -986,7 +986,7 @@
     1.4  		fi
     1.5  		if [ -n "$LZMA_SRC" ]; then
     1.6  			cd $pkgdir/source
     1.7 -			if [ "$(ls -A tmp | wc -l)" -gl 1 -o -f "$(echo tmp/*)" ]; then
     1.8 +			if [ "$(ls -A tmp | wc -l)" -gt 1 -o -f "$(echo tmp/*)" ]; then
     1.9  				mv tmp tmp-1; mkdir tmp
    1.10  				mv tmp-1 tmp/${SOURCE:-$PACKAGE}-$VERSION
    1.11  			fi
    1.12 @@ -1442,7 +1442,7 @@
    1.13  # cook <package> -b
    1.14  [ -n "$block" -o "$2" == '-b' ] && {
    1.15  	action 'Blocking package "%s"' "$1"
    1.16 -	[ $(grep "^$1$" $blocked) ] || echo "$1" >> $blocked
    1.17 +	grep -q "^$1$" $blocked || echo "$1" >> $blocked
    1.18  	status; newline
    1.19  	touch $activity
    1.20  	exit 0
    1.21 @@ -1807,7 +1807,7 @@
    1.22  		: ${HOST_ARCH=$ARCH}
    1.23  		debug "$(_ 'Host arch %s' "$HOST_ARCH")"
    1.24  		# Handle arm{v6hf,v7,..}
    1.25 -		if ! $(echo "$HOST_ARCH" | egrep -q "${ARCH%v[0-9]*}|any"); then
    1.26 +		if ! echo "$HOST_ARCH" | egrep -q "${ARCH%v[0-9]*}|any"; then
    1.27  			_ 'cook: %s' "HOST_ARCH=$HOST_ARCH"
    1.28  			error="$(_ "package \"%s\" doesn't cook or is not included in %s" "$pkg" "$ARCH")"
    1.29  			_ 'cook: %s' "error"
     2.1 --- a/cook.conf	Sun Aug 02 12:49:31 2020 +0000
     2.2 +++ b/cook.conf	Tue Nov 09 15:36:25 2021 +0000
     2.3 @@ -27,8 +27,8 @@
     2.4  AUTO_COOK=""
     2.5  
     2.6  # Hg wok for setup and flavors URL for the Cooker.
     2.7 -WOK_URL="http://hg.slitaz.org/wok"
     2.8 -FLAVORS_URL="http://hg.slitaz.org/flavors"
     2.9 +WOK_URL="https://hg.slitaz.org/wok"
    2.10 +FLAVORS_URL="https://hg.slitaz.org/flavors"
    2.11  
    2.12  # Cooker URL for RSS feed link (http://localhost/cgi-bin/cooker/cooker.cgi)
    2.13  COOKER_URL="http://cook.slitaz.org/"
     3.1 --- a/cooker	Sun Aug 02 12:49:31 2020 +0000
     3.2 +++ b/cooker	Tue Nov 09 15:36:25 2021 +0000
     3.3 @@ -287,7 +287,7 @@
     3.4  		HOST_ARCH=
     3.5  		. $wok/$pkg/receipt
     3.6  		if [ -n "$HOST_ARCH" ]; then
     3.7 -			if $(echo "$HOST_ARCH" | egrep -q "$ARCH|any"); then
     3.8 +			if echo "$HOST_ARCH" | egrep -q "$ARCH|any"; then
     3.9  				count=$(($count + 1))
    3.10  				echo "Adding: $pkg"
    3.11  				touch $pkg/arch.$ARCH
    3.12 @@ -518,7 +518,7 @@
    3.13  		cook_order | tee $LOGS/cookorder.log
    3.14  		cook_list ;;
    3.15  
    3.16 -	rev|-r)
    3.17 +	rev)
    3.18  		# Cook or recook a specific Hg revision.
    3.19  		rev="$2"
    3.20  		[ "$rev" ] || exit 0
     4.1 --- a/cookiso	Sun Aug 02 12:49:31 2020 +0000
     4.2 +++ b/cookiso	Tue Nov 09 15:36:25 2021 +0000
     4.3 @@ -99,7 +99,7 @@
     4.4  # Log activities, we want first letter capitalized.
     4.5  
     4.6  log() {
     4.7 -	grep ^[A-Z] | \
     4.8 +	grep '^[A-Z]' | \
     4.9  		sed "s#^[A-Z]\([^']*\)#$(date '+%F %R') : \0#" >> $activity
    4.10  }
    4.11  
     5.1 --- a/doc/cross.txt	Sun Aug 02 12:49:31 2020 +0000
     5.2 +++ b/doc/cross.txt	Tue Nov 09 15:36:25 2021 +0000
     5.3 @@ -32,7 +32,7 @@
     5.4  	------------------------------------------
     5.5  	# tazpkg -gi mercurial
     5.6  	# tazpkg -gi make
     5.7 -	# cd && hg clone http://hg.slitaz.org/cookutils
     5.8 +	# cd && hg clone https://hg.slitaz.org/cookutils
     5.9  	# cd cookutils
    5.10  	# make install-cross
    5.11  
     6.1 --- a/init.d/cooker	Sun Aug 02 12:49:31 2020 +0000
     6.2 +++ b/init.d/cooker	Tue Nov 09 15:36:25 2021 +0000
     6.3 @@ -20,7 +20,7 @@
     6.4  					mount -t devpts devpts $rootfs/dev/pts
     6.5  					mount -t tmpfs  shm    $rootfs/dev/shm
     6.6  				fi
     6.7 -				if [ ! $(mount | grep -q ${rootfs}$SLITAZ/src) ]; then
     6.8 +				if ! mount | grep -q ${rootfs}$SLITAZ/src; then
     6.9  					mount -o bind $SLITAZ/src ${rootfs}$SLITAZ/src
    6.10  					mount -o bind $SLITAZ/$version/packages \
    6.11  						${rootfs}$SLITAZ/packages
     7.1 --- a/lib/libcook.sh	Sun Aug 02 12:49:31 2020 +0000
     7.2 +++ b/lib/libcook.sh	Tue Nov 09 15:36:25 2021 +0000
     7.3 @@ -57,7 +57,7 @@
     7.4  # echo "Message" | log --> log "Message"
     7.5  
     7.6  log() {
     7.7 -	grep ^[A-Z] | \
     7.8 +	grep '^[A-Z]' | \
     7.9  		sed s"#^[A-Z]\([^']*\)#$(date -u '+%F %R') : \0#" >> $activity
    7.10  }
    7.11  
     8.1 --- a/lighttpd/index.cgi	Sun Aug 02 12:49:31 2020 +0000
     8.2 +++ b/lighttpd/index.cgi	Tue Nov 09 15:36:25 2021 +0000
     8.3 @@ -143,24 +143,24 @@
     8.4  <header>
     8.5  	<h1><a href="$base/">$title</a></h1>
     8.6  	<div class="network">
     8.7 -		<a class="out" href="http://www.slitaz.org/">Home</a>
     8.8 -		<a class="out" href="http://bugs.slitaz.org/">Bugs</a>
     8.9 -		<a class="out" href="http://hg.slitaz.org/wok-next/">Hg</a>
    8.10 -		<a class="out" href="http://roadmap.slitaz.org/">Roadmap</a>
    8.11 -		<a class="out" href="http://mypizza.slitaz.org/">Pizza</a>
    8.12 -		<a class="out" href="http://tank.slitaz.org/">Tank</a>
    8.13 +		<a class="out" href="https://www.slitaz.org/">Home</a>
    8.14 +		<a class="out" href="https://bugs.slitaz.org/">Bugs</a>
    8.15 +		<a class="out" href="https://hg.slitaz.org/wok-next/">Hg</a>
    8.16 +		<a class="out" href="https://roadmap.slitaz.org/">Roadmap</a>
    8.17 +		<a class="out" href="https://mypizza.slitaz.org/">Pizza</a>
    8.18 +		<a class="out" href="https://tank.slitaz.org/">Tank</a>
    8.19  		|
    8.20  		<a class="in" href="/cross/">Cross</a>
    8.21  		<a class="in" href="/i486.cgi">i486</a>
    8.22  		<a class="in" href="$base/cookiso.cgi">ISO</a>
    8.23  		<select onChange="window.location.href=this.value" style="display: none">
    8.24  			<option value=".">Go to…</option>
    8.25 -			<option value="http://www.slitaz.org/">Home</option>
    8.26 -			<option value="http://bugs.slitaz.org/">Bug tracker</option>
    8.27 -			<option value="http://hg.slitaz.org/wok/">Hg wok</option>
    8.28 -			<option value="http://roadmap.slitaz.org/">Roadmap</option>
    8.29 -			<option value="http://mypizza.slitaz.org/">Pizza</option>
    8.30 -			<option value="http://tank.slitaz.org/">Tank</option>
    8.31 +			<option value="https://www.slitaz.org/">Home</option>
    8.32 +			<option value="https://bugs.slitaz.org/">Bug tracker</option>
    8.33 +			<option value="https://hg.slitaz.org/wok/">Hg wok</option>
    8.34 +			<option value="https://roadmap.slitaz.org/">Roadmap</option>
    8.35 +			<option value="https://mypizza.slitaz.org/">Pizza</option>
    8.36 +			<option value="https://tank.slitaz.org/">Tank</option>
    8.37  			<option disabled>---------</option>
    8.38  			<option value="cross/">Cross</option>
    8.39  			<option value="i486.cgi">i486</option>
     9.1 --- a/modules/compressor	Sun Aug 02 12:49:31 2020 +0000
     9.2 +++ b/modules/compressor	Tue Nov 09 15:36:25 2021 +0000
     9.3 @@ -497,7 +497,7 @@
     9.4  	else
     9.5  		# ... from Hg
     9.6  		temp_conf=$(mktemp)
     9.7 -		wget -q -O $temp_conf -T 10 "http://hg.slitaz.org/wok/raw-file/tip$lpc"
     9.8 +		wget -q -O $temp_conf -T 10 "https://hg.slitaz.org/wok/raw-file/tip$lpc"
     9.9  		if [ -s $temp_conf ]; then
    9.10  			. $temp_conf
    9.11  		else