# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1526651857 -7200
# Node ID 930eba358f72cc0b21441795a15a31c43cc9c01e
# Parent  e4ec52b6fa1138cfd6a8f0ca4ca838bfabb4c40d
mkpkgiso: fix broken hg repos

diff -r e4ec52b6fa11 -r 930eba358f72 mirror-tools/rootfs/usr/bin/mkpkgiso
--- a/mirror-tools/rootfs/usr/bin/mkpkgiso	Sun Dec 03 21:16:53 2017 +0100
+++ b/mirror-tools/rootfs/usr/bin/mkpkgiso	Fri May 18 15:57:37 2018 +0200
@@ -55,8 +55,15 @@
 		for i in $repos/* ; do
 			grep -qs '\[paths]' $i/.hg/hgrc || continue
 			cd $i
-			hg pull
-			hg update
+			if hg pull -u 2>&1 | grep -q abort ; then
+				cd - > /dev/null
+				cd $repos
+				mv $(basename $i) $(basename $i)-DEAD
+				hg clone http://hg.slitaz.org/$(basename $i)
+				cp $(basename $i)-DEAD/.hg/hgrc \
+					$(basename $i)/.hg/hgrc
+				rm -rf $(basename $i)-DEAD
+			fi
 			cd - > /dev/null
 			case "$i" in
 			*/get-scripts)
@@ -68,7 +75,7 @@
 						echo "|$(head -n 6 $j | sed \
 							"/^$k=/!d;s/$k=//;s/\"\\([^\"]*\\).*/\\1/")"
 					done
-					} | sed "s/'/\\\\'/" | xargs echo
+					} | sed "s/'/\\\\'/" | sed "s|\$PACKAGE|$(basename $j)|" | xargs echo
 				done | sed 's/ |/|/g' > /var/www/slitaz/mirror/packages/get.list
 				chmod a+r /var/www/slitaz/mirror/packages/get.list
 			esac
@@ -315,6 +322,28 @@
 return 0
 }
 
+# Build hybdrid shell/mbr boot
+shhybrid() 
+{
+blkuuid="$(blkid $1 | sed 's/UUID=/!d;/.* UUID="\([^"]*\).*/\1/')"
+[ "$blkuuid" ] || blkuuid="$(blkid $1 | sed 's/.* \(LABEL="[^"]*"\).*/\1/')"
+echo -e "#\xE4\x73\x1C\nexec sed 1,/^#@/d/^#%/q \$0" | dd of=$1 conv=notrunc 2>/dev/null
+dd bs=512 seek=1 conv=notrunc of=$1 2>/dev/null <<EOT
+
+#@
+#!/bin/sh
+ 
+dev=\$({ blkid $(basename $1); blkid; } | sed '/$blkuuid/!d;s/:.*//;q')
+ 
+if [ -n "\$dev" ]; then
+	mkdir -p /mnt/packages
+	mount -t iso9660 -o loop,ro \$dev /mnt/packages
+	/mnt/packages/install.sh
+fi
+#%
+EOT
+}
+
 # Gen boot part
 BOOT_OPT=""
 iso=$ISO_DIR/slitaz-$PKG_VER.iso
@@ -443,6 +472,10 @@
 which $ISOHYBRID > /dev/null && $ISOHYBRID $IMAGE 2> /dev/null
 status
 
+echo -n "Creating hybrid shell/mbr"
+shhybrid $IMAGE
+status
+
 echo -n "Calculating md5sum"
 md5sum $IMAGE > $(basename $IMAGE .iso).md5
 status