# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1248428470 -7200
# Node ID 827ab3d52e8d09f7c3eb52d7e54d1a4d3abe794b
# Parent  f060e21dde4ce50734556467f260343401e54149
mirror-tools/mkpkgiso: fix sort weights

diff -r f060e21dde4c -r 827ab3d52e8d mirror-tools/stuff/usr/bin/mkpkgiso
--- a/mirror-tools/stuff/usr/bin/mkpkgiso	Thu Jul 23 15:51:49 2009 +0000
+++ b/mirror-tools/stuff/usr/bin/mkpkgiso	Fri Jul 24 11:41:10 2009 +0200
@@ -8,7 +8,8 @@
 VERSION=0.5
 
 ROOT=/home/slitaz/iso
-TEMP_DIR=${ROOT}/_iso.$$
+SORT_DIR=_iso.$$
+TEMP_DIR=${ROOT}/$SORT_DIR
 SORT_FILE=${ROOT}/_sort.$$
 PKG_VER=$1
 shift
@@ -54,6 +55,15 @@
     echo -e "\\033[0;39m ]"
 }
 
+add_sort()
+{
+	if true; then
+		echo "$1 $2"
+	else
+		( cd $ROOT ; find $1 | awk "{ printf \"%s $2\\n\",\$0 }" )
+	fi
+}
+
 # Create temp directory
 mkdir -p $TEMP_DIR/packages/$PKG_VER
 
@@ -128,15 +138,18 @@
 
 status
 cat > $SORT_FILE <<EOT
-install.sh 8
-README 8
-index.html 8
-md5sum 8
-style.css 8
-images/header.png 8
+$SORT_DIR/install.sh -4000
+$SORT_DIR/README -4000
+$SORT_DIR/index.html -4000
+$SORT_DIR/md5sum -4000
+$SORT_DIR/style.css -4000
+$SORT_DIR/images/header.png -4000
+$SORT_DIR/boot/bzImage 2
+$SORT_DIR/boot/rootfs.gz 1
+$SORT_DIR/packages -9000
 EOT
-( cd $TEMP_DIR ; ls packages/*/packages* packages/*/files.list.lzma ) | \
-		awk '{ printf "%s 4\n",$0 }' >> $SORT_FILE
+( cd $ROOT; ls $SORT_DIR/packages/*/packages* $SORT_DIR/packages/*/files.list.lzma ) | \
+		awk '{ printf "%s -7000\n",$0 }' >> $SORT_FILE
 chmod 755  $TEMP_DIR/install.sh
 
 case " $OPTIONS " in
@@ -185,8 +198,7 @@
 echo "=> Wok (cooking) is in \$DIR/wok"
 EOF
 	if get_from_hg wok "wok (cooking)"; then
-		( cd $TEMP_DIR ; find wok -not -type d ) | \
-			awk '{ printf "%s 2\n",$0 }' >> $SORT_FILE
+		add_sort $SORT_DIR/wok -8000 >> $SORT_FILE
 	fi;;
 --wok-stable)
 	cat >>$TEMP_DIR/install.sh<<EOF
@@ -194,13 +206,11 @@
 EOF
 	if get_from_hg wok-stable "wok (stable)"; then
 		mv $TEMP_DIR/wok-stable $TEMP_DIR/wok
-		( cd $TEMP_DIR ; find wok -not -type d ) | \
-			awk '{ printf "%s 2\n",$0 }' >> $SORT_FILE
+		add_sort $SORT_DIR/wok -8000 >> $SORT_FILE
 	fi;;
 --website)
 	if get_from_hg website "web site"; then
-		( cd $TEMP_DIR ; find website -not -type d ) | \
-			awk '{ printf "%s 5\n",$0 }' >> $SORT_FILE
+		add_sort $SORT_DIR/website -6000 >> $SORT_FILE
 		cat >>$TEMP_DIR/install.sh<<EOF
 [ -d /var/www ] || mkdir -p /var/www
 ln -s \$DIR/website /var/www
@@ -238,9 +248,13 @@
 			mkdir -p "$(dirname $TEMP_DIR/$file)"
 		isoinfo -R -x "$file" -i $iso > "$TEMP_DIR/$file"
 	done
+	if [ -f "$(echo $TEMP_DIR/boot/vmlinuz*)" ]; then
+		rm -f $TEMP_DIR/boot/bzImage
+		ln $TEMP_DIR/boot/vmlinuz* $TEMP_DIR/boot/bzImage
+    fi
 	status
-	BOOT_OPT="-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
--no-emul-boot -boot-load-size 4 -boot-info-table -sort $SORT_FILE"
+	BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \
+-c boot/isolinux/boot.cat  -no-emul-boot -boot-load-size 4 -boot-info-table"
     case " $OPTIONS " in
 	*\ --auto-install\ *)
     	echo -n "Enable auto install"
@@ -257,7 +271,7 @@
     	echo -n "Enable loram autodetection"
 		cp $PXE_DIR/ifmem.c32 "$TEMP_DIR/boot/isolinux"
 		isoinfo -R -x "/usr.sqfs" -i $isoloram > "$TEMP_DIR/usr.sqfs"
-		echo 'usr.sqfs 8' >> $SORT_FILE
+		add_sort $SORT_DIR/usr.sqfs -5000 >> $SORT_FILE
 		isoinfo -R -x "/boot/rootfs.gz" -i $isoloram > \
 			"$TEMP_DIR/boot/loram.gz"
 		sed -i -e 's|kernel /boot/bzImage|kernel /boot/isolinux/ifmem.c32\n\tappend 160768 core loram\n|' \
@@ -266,8 +280,7 @@
 		status
 		;;
 	esac
-	( cd $TEMP_DIR ; find boot -not -type d ) | \
-		awk '{ printf "%s 9\n",$0 }' >> $SORT_FILE
+	add_sort $SORT_DIR/boot 0 >> $SORT_FILE
 	;;
 *\ --webboot\ *)
 	if extract_boot gpxe; then
@@ -276,15 +289,14 @@
 		isoinfo -x "/BOOT/ISOLINUX/ISOLINUX.BIN;1" -i $iso > \
 			$TEMP_DIR/boot/isolinux/isolinux.bin
 		mv $TEMP_DIR/boot/gpxe $TEMP_DIR/boot/isolinux
-		( cd $TEMP_DIR ; find boot -not -type d ) | \
-			awk '{ printf "%s 9\n",$0 }' >> $SORT_FILE
+		add_sort $SORT_DIR/boot 0 >> $SORT_FILE
 		cat > $TEMP_DIR/boot/isolinux/isolinux.cfg <<EOT
 default gpxe
 append http://mirror.slitaz.org/pxe/pxelinux.0
 EOT
 		status
-		BOOT_OPT="-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
--no-emul-boot -boot-load-size 4 -boot-info-table -sort $SORT_FILE"
+		BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \
+-c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 	fi
 	;;
 esac
@@ -294,6 +306,8 @@
 		    tail -1 | awk '{ print $1 }') used by boot."
 fi
 
+sort -r -k 2 $SORT_FILE > $SORT_FILE.$$
+mv $SORT_FILE.$$ $SORT_FILE
 case " $OPTIONS " in
 *\ --dry-run\ *)
 	echo "Please check and remove $TEMP_DIR and $SORT_FILE"