# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1450525801 -7200
# Node ID 06763cedfc7c212f71fdd7fd1f0f843013aa50f7
# Parent  879df97289566c6b7d0f8014ec98692f7d4d1562
Module 'convert': fix working in general and with .pet packages in particular (thanks xaropebr)

diff -r 879df9728956 -r 06763cedfc7c modules/convert
--- a/modules/convert	Fri Dec 18 11:39:34 2015 +0200
+++ b/modules/convert	Sat Dec 19 13:50:01 2015 +0200
@@ -59,7 +59,7 @@
 SHORT_DESC="$descrip"
 WEB_SITE="$url"
 MAINTAINER="$maintainer"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 		[ -s $file/var/lib/upkg/files/*.config.bz2 ] &&
 			cat >> "$file/receipt" <<EOT
@@ -111,7 +111,7 @@
 SHORT_DESC="$descrip"
 WEB_SITE="$url"
 MAINTAINER="$maintainer"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 	[ -s 'pre-install.sh' ] && cat >> "$file/receipt" <<EOT
 
@@ -163,7 +163,7 @@
 SHORT_DESC="$descrip"
 WEB_SITE="${homepage:-$url}"
 MAINTAINER="$maintainer"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 		show_unresolved_lib "$file/receipt"
 		[ -s 'conffiles' ] && cat >> "$file/receipt" <<EOT
@@ -228,7 +228,7 @@
 SHORT_DESC="$descrip"
 WEB_SITE="http://www.nutyx.org/"
 MAINTAINER="nobody@slitaz.org"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 		show_unresolved_lib "$file/receipt"
 		rm -f $file/fs/.[A-Z]*
@@ -266,7 +266,7 @@
 SHORT_DESC="$descrip"
 WEB_SITE="$url"
 MAINTAINER="$maintainer"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 		show_unresolved_lib "$file/receipt"
 		rm -f $file/fs/.[A-Z]*
@@ -283,6 +283,7 @@
 # get package and version from PACKAGE_FILE
 
 parse_pkgname() {
+	debug "parse_pkgname('$1', '$2')"
 	package=$(basename "${2:-$PACKAGE_FILE}" "$1")
 	IFS='-'
 	set -- "$package"
@@ -290,17 +291,18 @@
 	package="$1"
 	version="$2"
 	if [ -z "$version" ]; then
-		package=${1%%[0-9\.]*}
-		version=${1#$package}
+		package=${1%%-[0-9\.]*}
+		version=${1#$package-}
 	fi
 	file="$package-$version"
 	mkdir "$file"
+	debug "  package='$package' version='$version' file='$file'"
 }
 
 
 finish_convert_puppy() {
 	rm -f fs/*.specs
-	mv fs "$file"
+	mkdir "$file"; mv fs "$file"
 	cat > "$file/receipt" <<EOT
 # SliTaz package receipt.
 # generated by tazpkg from puppy package $(basename "$PACKAGE_FILE")
@@ -310,20 +312,23 @@
 SHORT_DESC="$desc"
 WEB_SITE="http://puppylinux.org/"
 MAINTAINER="nobody@slitaz.org"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 	show_unresolved_lib "$file/receipt"
 	for i in install uninstall; do
-		[ -f "$file/fs/p$i.sh" ] && cat >> "$file/receipt" <<EOM
+		if [ -f "$file/fs/p$i.sh" ]; then
+			SEPARATOR="EOT$RANDOM"
+			cat >> "$file/receipt" <<EOT
 
 post_$i()
 {
-chroot \$1/ sh - << EOT
-cd /
-$(sed -e 's/\\/\\\\/g' -e 's/\$/\\$/g' < "$file/fs/p$i.sh" ; rm -f "$file/fs/p$i.sh")
+chroot \$1/ sh - <<$SEPARATOR
+	cd /
+	$(sed -e 's/\\/\\\\/g' -e 's/\$/\\$/g' < "$file/fs/p$i.sh" ; rm -f "$file/fs/p$i.sh")
+$SEPARATOR
+}
 EOT
-}
-EOM
+		fi
 	done
 	sed -i 's/post_uninstall/post_remove/' "$file/receipt"
 	tazpkg pack "$file"
@@ -355,12 +360,22 @@
 # convert a .pet package to .tazpkg
 
 convert_pet() {
+	debug "convert_pet()"
 	mkdir -p "$TMP_DIR"
 	cd "$TMP_DIR"
 	parse_pkgname .pet
-	tar -xzf "$PACKAGE_FILE" 2>/dev/null
-	. $package*/*.specs
-	desc="$PETMENUDESCR"
+	busybox tar -xzf "$PACKAGE_FILE"
+
+	PET_SPECS="$(find $TMP_DIR -maxdepth 2 -name 'pet.specs')"
+	if [ -e "$PET_SPECS" ]; then
+		debug "pet.specs with '|'"
+		desc="$(awk -F'|' '{print $10}' $PET_SPECS)"
+		debug "desc='$desc'"
+	else
+		# TODO: I need to have '.pet' file that will work this way!
+		. $package*/*.specs
+		desc="$PETMENUDESCR"
+	fi
 	mv $package*/ fs
 	finish_convert_puppy
 }
@@ -391,7 +406,7 @@
 SHORT_DESC="$desc"
 WEB_SITE="http://www.slax.org/"
 MAINTAINER="nobody@slitaz.org"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 	show_unresolved_lib "$file/receipt"
 	[ -f $file/fs/var/log/scripts/$package* ] && cat >> "$file/receipt" <<EOM
@@ -433,7 +448,7 @@
 SHORT_DESC="$descrip"
 WEB_SITE="http://www.slackware.com/packages/"
 MAINTAINER="nobody@slitaz.org"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 		show_unresolved_lib "$file/receipt"
 		[ -f "$file/fs/install/doinst.sh" ] && cat >> "$file/receipt" <<EOM
@@ -490,7 +505,7 @@
 		  "$PACKAGE_FILE" $TMP_DIR/$file/fs/usr/share/doc/*/copyright | \
 		  sed 's|.*common-licenses/\([-\.A-Za-z0-9]*\).*|\1|;s|[-\.]$||;q')
 		[ -n "$LICENSE" ] && echo "LICENSE=\"$LICENSE\"" >> "$file/receipt"
-		echo "DEPENDS=\"$(find_depends)\"" >> "$file/receipt"
+		echo "DEPENDS=\"$(find_depends .)\"" >> "$file/receipt"
 		[ -s 'conffiles' ] && cat >> "$file/receipt" <<EOT
 CONFIG_FILES="$(cat conffiles)"
 EOT
@@ -575,7 +590,7 @@
 		fi
 	fi
 	cd ../..
-	echo "DEPENDS=\"$(find_depends)\"" >> "$TMP_DIR/$file/receipt"
+	echo "DEPENDS=\"$(find_depends .)\"" >> "$TMP_DIR/$file/receipt"
 	show_unresolved_lib "$TMP_DIR/$file/receipt"
 	tazpkg pack "$file"
 	mv "$file.tazpkg" "$TOP_DIR"
@@ -622,7 +637,7 @@
 HOST_ARCH="$HOST_ARCH"
 CONFIG_FILES="$(sed '/<key>conf_files<\/key>/,/<key>/!d;/array>/d;/<key>/d;s/.*>\(.*\)<.*/\1/' fs/props.plist)"
 
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 
 EOT
 		while read script func ; do
@@ -669,7 +684,7 @@
 SHORT_DESC="tinycore package $(basename "$PACKAGE_FILE")"
 WEB_SITE="http://tinycorelinux.net/"
 MAINTAINER="nobody@slitaz.org"
-DEPENDS="$(find_depends)"
+DEPENDS="$(find_depends .)"
 EOT
 	show_unresolved_lib "$file/receipt"
 	script="$file/fs/usr/local/tce.installed/$PACKAGE"
@@ -729,6 +744,9 @@
 }
 
 
+
+PACKAGE_FILE="$(realpath "$PACKAGE_FILE")"
+debug "PACKAGE_FILE='$PACKAGE_FILE'"
 if [ "$(dd if="$PACKAGE_FILE" bs=8 count=1 skip=1 2>/dev/null)" == 'debian-b' ]; then
 	convert_deb
 else