# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1501151790 -10800
# Node ID 4e8c86306ce230c87e720af5ce136c5fff2019a7
# Parent  db84a0fdf6f4a68f939096e672431a41cdc420e7
Minor bug fixes due to the change in the behavior of the dot command in Busybox-1.27.

diff -r db84a0fdf6f4 -r 4e8c86306ce2 cook
--- a/cook	Sun Jul 23 12:35:12 2017 +0200
+++ b/cook	Thu Jul 27 13:36:30 2017 +0300
@@ -981,7 +981,7 @@
 	# Create files.list with redirecting find output.
 	action 'Creating the list of files...'
 	cd $fs
-	find . -type f -print > ../files.list
+	find . -type f -print >  ../files.list
 	find . -type l -print >> ../files.list
 	cd ..; sed -i 's|^.||' files.list
 	status
@@ -1557,7 +1557,7 @@
 			for pkg in $(fgrep 'HOST_ARCH=' */receipt | egrep "$ARCH|any" | cut -d: -f1)
 			do
 				unset HOST_ARCH
-				. $pkg
+				. ./$pkg
 				count=$(($count + 1))
 				colorize 34 "$PACKAGE"
 			done
@@ -1795,13 +1795,13 @@
 		count=0
 		title 'Checking for uncooked packages'
 
-		for pkg in *; do
+		for i in *; do
 			unset HOST_ARCH EXTRAVERSION
-			[ ! -e $pkg/receipt ] && continue
-			. $pkg/receipt
+			[ ! -e $i/receipt ] && continue
+			. ./$i/receipt
 			# Source cooked pkg receipt to get EXTRAVERSION
-			if [ -d "$WOK/$pkg/taz" ]; then
-				cd $WOK/$pkg/taz/$pkg-*
+			if [ -d "$WOK/$i/taz" ]; then
+				cd $WOK/$i/taz/$(ls $WOK/$i/taz/ | head -n1)
 				. ./receipt; cd $WOK
 			fi 
 			case "$ARCH" in
@@ -1809,7 +1809,7 @@
 					debug "$(_ 'Package "%s"' "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg")"
 					if [ ! -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg" ]; then
 						count=$(($count + 1))
-						colorize 34 "$pkg"
+						colorize 34 "$i"
 					fi ;;
 				arm*)
 					# Check only packages included in arch
@@ -1817,7 +1817,7 @@
 						# *.tazpkg
 						if [ ! -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" ]; then
 							count=$(($count + 1))
-							colorize 34 "$pkg"
+							colorize 34 "$i"
 						fi
 					fi ;;
 			esac
diff -r db84a0fdf6f4 -r 4e8c86306ce2 cookall.sh
--- a/cookall.sh	Sun Jul 23 12:35:12 2017 +0200
+++ b/cookall.sh	Thu Jul 27 13:36:30 2017 +0300
@@ -8,7 +8,7 @@
 touch $DONELIST
 while true; do
 	chmod +x $DONELIST
-	for i in $WOK/*/receipt ; do
+	for i in $WOK/*/receipt; do
 		pkg=$(basename ${i%/receipt})
 		grep -q "^$pkg$" $DONELIST && continue
 		grep -q "^$pkg$" $CACHE/broken && continue
@@ -16,16 +16,16 @@
 		HOST_ARCH="i486"
 		. $i
 		case " $HOST_ARCH " in
-		*\ i486\ *|*\ any\ *);;
-		*) continue;;
+			*\ i486\ *|*\ any\ *);;
+			*) continue;;
 		esac
-		for j in $WANTED ; do
+		for j in $WANTED; do
 			grep -q "^$j$" $DONELIST || continue 2
 			grep -q "^$j$" $CACHE/broken && continue 2
 		done
-		for j in $BUILD_DEPENDS ; do
+		for j in $BUILD_DEPENDS; do
 			case " $SLITAZ_TOOLCHAIN " in
-			*\ $j\ *) continue ;;
+				*\ $j\ *) continue;;
 			esac
 			grep -q "^$j$" $DONELIST || continue 2
 			grep -q "^$j$" $CACHE/broken && continue 2
@@ -37,7 +37,7 @@
 	done
 	[ -x $DONELIST ] || continue
 	# try to break build dep loops...
-	for pkg in gettext python udev cups libQtClucene menu-cache tzdata ; do
+	for pkg in gettext python udev cups libQtClucene menu-cache tzdata; do
 		grep -q "^$pkg$" $DONELIST && continue
 		grep -q "^$pkg$" $CACHE/broken && continue
 		. $WOK/$pkg/receipt
@@ -51,18 +51,18 @@
 
 TODOLIST=/tmp/todolist
 # list packages to build and their (build) dependancies
-for i in $WOK/*/receipt ; do
+for i in $WOK/*/receipt; do
 	grep -q "^$(basename ${i%/receipt})$" $DONELIST && continue
 	unset BUILD_DEPENDS WANTED
 	HOST_ARCH="i486"
 	. $i
 	case " $HOST_ARCH " in
-	*\ i486\ *|*\ any\ *);;
-	*) continue;;
+		*\ i486\ *|*\ any\ *);;
+		*) continue;;
 	esac
 	grep -q "^$PACKAGE$" $CACHE/broken && echo -n "broken/"
 	echo -n "$PACKAGE : "
-	for j in $BUILD_DEPENDS $WANTED ; do
+	for j in $BUILD_DEPENDS $WANTED; do
 		grep -q "^$j$" $DONELIST || echo -n "$j "
 		grep -q "^$j$" $CACHE/broken && echo -n "broken/$j "
 	done
diff -r db84a0fdf6f4 -r 4e8c86306ce2 data/cooklist
--- a/data/cooklist	Sun Jul 23 12:35:12 2017 +0200
+++ b/data/cooklist	Thu Jul 27 13:36:30 2017 +0300
@@ -5,8 +5,5 @@
 gcc
 make
 zlib
-zlib-dev
 pcre
-pcre-dev
 ncurses
-ncurses-dev
diff -r db84a0fdf6f4 -r 4e8c86306ce2 data/receipt
--- a/data/receipt	Sun Jul 23 12:35:12 2017 +0200
+++ b/data/receipt	Thu Jul 27 13:36:30 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE=""
 VERSION=""
@@ -7,10 +7,10 @@
 MAINTAINER=""
 LICENSE=""
 WEB_SITE=""
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS=""
 
 # Rules to configure and make the package.
@@ -22,5 +22,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
+	copy @std @dev
+	DEPENDS=""
 }
diff -r db84a0fdf6f4 -r 4e8c86306ce2 modules/pkgdb
--- a/modules/pkgdb	Sun Jul 23 12:35:12 2017 +0200
+++ b/modules/pkgdb	Thu Jul 27 13:36:30 2017 +0300
@@ -82,10 +82,10 @@
 		[ -e "$WOK/$i/taz/$j/description.txt" ] || continue
 
 		pkgname=$(. $WOK/$i/taz/$j/receipt; echo $PACKAGE)
-		echo "$pkgname" >> descriptions.txt
-		cat "$WOK/$i/taz/$j/description.txt" | sed 's|^$| |' >> descriptions.txt
-		echo >> descriptions.txt
-	done
+		echo "$pkgname"
+		sed 's|^$| |' "$WOK/$i/taz/$j/description.txt"
+		echo
+	done >> descriptions.txt
 done
 echo " ($(filesize $PKGS/descriptions.txt))" | dblog
 
@@ -100,7 +100,7 @@
 		pack="$i/taz/$j"
 		[ -f "$WOK/$pack/receipt" ] || continue
 		unset_receipt
-		. $pack/receipt
+		. ./$pack/receipt
 
 		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg" -o \
 		     -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" ]; then
diff -r db84a0fdf6f4 -r 4e8c86306ce2 web/cooker.cgi
--- a/web/cooker.cgi	Sun Jul 23 12:35:12 2017 +0200
+++ b/web/cooker.cgi	Thu Jul 27 13:36:30 2017 +0300
@@ -226,9 +226,9 @@
 
 list_packages() {
 	cd $PKGS
-	ls -1t *.tazpkg | head -n 20 | \
+	ls -1t *.tazpkg | head -n20 | \
 	while read file; do
-		echo -n $(TZ=UTC stat -c '%y' $PKGS/$file | cut -d . -f 1 | sed s/:[0-9]*$//)
+		echo -n $(TZ=UTC stat -c '%y' $PKGS/$file | cut -d. -f1 | sed s/:[0-9]*$//)
 		echo " : $file"
 	done
 }
diff -r db84a0fdf6f4 -r 4e8c86306ce2 web/cookiso.cgi
--- a/web/cookiso.cgi	Sun Jul 23 12:35:12 2017 +0200
+++ b/web/cookiso.cgi	Thu Jul 27 13:36:30 2017 +0300
@@ -46,9 +46,9 @@
 
 list_isos() {
 	cd $iso
-	ls -1t *.iso | head -6 | \
+	ls -1t *.iso | head -n6 | \
 	while read file; do
-		echo -n $(stat -c '%y' $file | cut -d . -f 1 | sed s/:[0-9]*$//)
+		echo -n $(stat -c '%y' $file | cut -d. -f1 | sed s/:[0-9]*$//)
 		echo " : $file"
 	done
 }