# HG changeset patch # User Pascal Bellard # Date 1636472185 0 # Node ID e58a083722aada34279442b04c026fbf15a94910 # Parent dc3ff2ae7314f8592eb5864e84752fc6cb9e8adf cook: typo diff -r dc3ff2ae7314 -r e58a083722aa cook --- a/cook Sun Aug 02 12:49:31 2020 +0000 +++ b/cook Tue Nov 09 15:36:25 2021 +0000 @@ -986,7 +986,7 @@ fi if [ -n "$LZMA_SRC" ]; then cd $pkgdir/source - if [ "$(ls -A tmp | wc -l)" -gl 1 -o -f "$(echo tmp/*)" ]; then + if [ "$(ls -A tmp | wc -l)" -gt 1 -o -f "$(echo tmp/*)" ]; then mv tmp tmp-1; mkdir tmp mv tmp-1 tmp/${SOURCE:-$PACKAGE}-$VERSION fi @@ -1442,7 +1442,7 @@ # cook -b [ -n "$block" -o "$2" == '-b' ] && { action 'Blocking package "%s"' "$1" - [ $(grep "^$1$" $blocked) ] || echo "$1" >> $blocked + grep -q "^$1$" $blocked || echo "$1" >> $blocked status; newline touch $activity exit 0 @@ -1807,7 +1807,7 @@ : ${HOST_ARCH=$ARCH} debug "$(_ 'Host arch %s' "$HOST_ARCH")" # Handle arm{v6hf,v7,..} - if ! $(echo "$HOST_ARCH" | egrep -q "${ARCH%v[0-9]*}|any"); then + if ! echo "$HOST_ARCH" | egrep -q "${ARCH%v[0-9]*}|any"; then _ 'cook: %s' "HOST_ARCH=$HOST_ARCH" error="$(_ "package \"%s\" doesn't cook or is not included in %s" "$pkg" "$ARCH")" _ 'cook: %s' "error" diff -r dc3ff2ae7314 -r e58a083722aa cook.conf --- a/cook.conf Sun Aug 02 12:49:31 2020 +0000 +++ b/cook.conf Tue Nov 09 15:36:25 2021 +0000 @@ -27,8 +27,8 @@ AUTO_COOK="" # Hg wok for setup and flavors URL for the Cooker. -WOK_URL="http://hg.slitaz.org/wok" -FLAVORS_URL="http://hg.slitaz.org/flavors" +WOK_URL="https://hg.slitaz.org/wok" +FLAVORS_URL="https://hg.slitaz.org/flavors" # Cooker URL for RSS feed link (http://localhost/cgi-bin/cooker/cooker.cgi) COOKER_URL="http://cook.slitaz.org/" diff -r dc3ff2ae7314 -r e58a083722aa cooker --- a/cooker Sun Aug 02 12:49:31 2020 +0000 +++ b/cooker Tue Nov 09 15:36:25 2021 +0000 @@ -287,7 +287,7 @@ HOST_ARCH= . $wok/$pkg/receipt if [ -n "$HOST_ARCH" ]; then - if $(echo "$HOST_ARCH" | egrep -q "$ARCH|any"); then + if echo "$HOST_ARCH" | egrep -q "$ARCH|any"; then count=$(($count + 1)) echo "Adding: $pkg" touch $pkg/arch.$ARCH @@ -518,7 +518,7 @@ cook_order | tee $LOGS/cookorder.log cook_list ;; - rev|-r) + rev) # Cook or recook a specific Hg revision. rev="$2" [ "$rev" ] || exit 0 diff -r dc3ff2ae7314 -r e58a083722aa cookiso --- a/cookiso Sun Aug 02 12:49:31 2020 +0000 +++ b/cookiso Tue Nov 09 15:36:25 2021 +0000 @@ -99,7 +99,7 @@ # Log activities, we want first letter capitalized. log() { - grep ^[A-Z] | \ + grep '^[A-Z]' | \ sed "s#^[A-Z]\([^']*\)#$(date '+%F %R') : \0#" >> $activity } diff -r dc3ff2ae7314 -r e58a083722aa doc/cross.txt --- a/doc/cross.txt Sun Aug 02 12:49:31 2020 +0000 +++ b/doc/cross.txt Tue Nov 09 15:36:25 2021 +0000 @@ -32,7 +32,7 @@ ------------------------------------------ # tazpkg -gi mercurial # tazpkg -gi make - # cd && hg clone http://hg.slitaz.org/cookutils + # cd && hg clone https://hg.slitaz.org/cookutils # cd cookutils # make install-cross diff -r dc3ff2ae7314 -r e58a083722aa init.d/cooker --- a/init.d/cooker Sun Aug 02 12:49:31 2020 +0000 +++ b/init.d/cooker Tue Nov 09 15:36:25 2021 +0000 @@ -20,7 +20,7 @@ mount -t devpts devpts $rootfs/dev/pts mount -t tmpfs shm $rootfs/dev/shm fi - if [ ! $(mount | grep -q ${rootfs}$SLITAZ/src) ]; then + if ! mount | grep -q ${rootfs}$SLITAZ/src; then mount -o bind $SLITAZ/src ${rootfs}$SLITAZ/src mount -o bind $SLITAZ/$version/packages \ ${rootfs}$SLITAZ/packages diff -r dc3ff2ae7314 -r e58a083722aa lib/libcook.sh --- a/lib/libcook.sh Sun Aug 02 12:49:31 2020 +0000 +++ b/lib/libcook.sh Tue Nov 09 15:36:25 2021 +0000 @@ -57,7 +57,7 @@ # echo "Message" | log --> log "Message" log() { - grep ^[A-Z] | \ + grep '^[A-Z]' | \ sed s"#^[A-Z]\([^']*\)#$(date -u '+%F %R') : \0#" >> $activity } diff -r dc3ff2ae7314 -r e58a083722aa lighttpd/index.cgi --- a/lighttpd/index.cgi Sun Aug 02 12:49:31 2020 +0000 +++ b/lighttpd/index.cgi Tue Nov 09 15:36:25 2021 +0000 @@ -143,24 +143,24 @@

$title

- Home - Bugs - Hg - Roadmap - Pizza - Tank + Home + Bugs + Hg + Roadmap + Pizza + Tank | Cross i486 ISO