# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1475413376 -7200
# Node ID 77dec4337e5c0a92cefce732d0a4b66a00bc4e15
# Parent  6ee34149411d8dc120a522a6b9b1c9bf79246103
syslinux/taziso: parse include files

diff -r 6ee34149411d -r 77dec4337e5c syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Sun Oct 02 13:16:24 2016 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Sun Oct 02 15:02:56 2016 +0200
@@ -591,7 +591,7 @@
 md5()
 {
 	dotwait "Checking files"
-	( cd $media ; ${md5sum:-md5sum -c md5sum*} | sort ) > /tmp/data
+	( cd $media ; ${md5sum:-md5sum -c md5sum*} 2>&1 | sort ) > /tmp/data
 	unset md5sum
 	rm -f /tmp/wait
 	if [ "$1" ]; then
@@ -1204,7 +1204,7 @@
 floppyset()
 {
 	gotcdfile 'isolinux.cfg'
-	parse_isolinux < $file > /tmp/var$$
+	$0 include $file | parse_isolinux > /tmp/var$$
 	. /tmp/var$$
 	[ -z "$KERNEL" ] && echo "Can't parse isolinux.cfg" && return
 	for i in $media/$KERNEL $(dirname $file)/$KERNEL $media/$(locase $KERNEL) \
@@ -1325,6 +1325,11 @@
 		-c %y $media/.|sed 's/ .*//')  $(basename "$ISO")"
 }
 
+if [ "$1" == "include" ]; then
+	[ -s "$2" ] && cd $(dirname "$2") && awk -v exe=$0 \
+	'{ if ($1 == "include") system(exe " include " $2); else print }' <"$2"
+	exit
+fi
 ISO="${1:-/dev/null}"
 [ -z "$(isiso 2> /dev/null)" ] && echo "Usage : $0 file.iso" && exit 1
 media=/tmp/media$$