Fix the issue (introduced in 1.1.06) that the Ventoy ISO partition cannot be mounted...

[Ventoy.git] / INSTALL / ventoy_pack.sh

diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh
index a7d3062e56e316255372a306f6888dd07fd5e09c..e03e8b02eb27866b489f4755c5f39b5d16e3f95b 100644 (file)
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -91,15 +91,20 @@ cd ../../
 #tar menu txt & update menulang.cfg
 cd $tmpmnt/grub/
 
-for vtlang in $(ls menu/); do
+vtlangtitle=$(grep VTLANG_LANGUAGE_NAME menu/zh_CN.json | awk -F\" '{print $4}')
+echo "menuentry \"zh_CN  -  $vtlangtitle\" --class=menu_lang_item --class=debug_menu_lang --class=F5tool {" >> menulang.cfg
+echo "    vt_load_menu_lang zh_CN"  >> menulang.cfg
+echo "}"  >> menulang.cfg
+
+ls -1 menu/ | grep -v 'zh_CN' | sort | while read vtlang; do
     vtlangname=${vtlang%.*}
-    vtlangtitle=$(grep VTMENU_LANGUAGE_NAME menu/$vtlang | awk -F\" '{print $4}')
-    echo "menuentry \"$vtlangtitle\" --class=menu_lang_item --class=debug_menu_lang --class=F5tool {" >> menulang.cfg
+    vtlangtitle=$(grep VTLANG_LANGUAGE_NAME menu/$vtlang | awk -F\" '{print $4}')
+    echo "menuentry \"$vtlangname  -  $vtlangtitle\" --class=menu_lang_item --class=debug_menu_lang --class=F5tool {" >> menulang.cfg
     echo "    vt_load_menu_lang $vtlangname"  >> menulang.cfg
     echo "}"  >> menulang.cfg
 done
-echo "menuentry '@VTMENU_RETURN_PREVIOUS' --class=vtoyret VTOY_RET {" >> menulang.cfg
-echo "        echo 'Return ...'" >> menulang.cfg
+echo "menuentry \"\$VTLANG_RETURN_PREVIOUS\" --class=vtoyret VTOY_RET {" >> menulang.cfg
+echo "        echo \"Return ...\"" >> menulang.cfg
 echo "}" >> menulang.cfg
 
 tar czf menu.tar.gz ./menu/
@@ -164,8 +169,27 @@ sed 's/.*SCRIPT_DEL_THIS \(.*\)/\1/g' -i $tmpdir/WebUI/index.html
 
 #32MB disk img
 dd status=none if=$LOOP of=$tmpdir/ventoy/ventoy.disk.img bs=512 count=$VENTOY_SECTOR_NUM skip=$part2_start_sector
+
+
+#4k image
+# echo "make 4K img ..."
+# dd status=none if=/dev/zero of=$tmpdir/ventoy/ventoy_4k.disk.img bs=1M count=32
+# mkfs.vfat -F 16 -n VTOYEFI -s 1 -S 4096 $tmpdir/ventoy/ventoy_4k.disk.img
+# vDIR1=$(mktemp -d)
+# vDIR2=$(mktemp -d)
+# mount $tmpdir/ventoy/ventoy.disk.img $vDIR1
+# mount $tmpdir/ventoy/ventoy_4k.disk.img $vDIR2
+# cp -a $vDIR1/* $vDIR2/
+# umount $vDIR1
+# umount $vDIR2
+# rm -rf $vDIR1 $vDIR2
+
+# xz --check=crc32 $tmpdir/ventoy/ventoy_4k.disk.img
+
 xz --check=crc32 $tmpdir/ventoy/ventoy.disk.img
 
+
+
 losetup -d $LOOP && rm -f img.bin
 
 rm -f ventoy-${curver}-linux.tar.gz
@@ -221,6 +245,7 @@ cp $OPT VentoyVlnk.exe $tmpdir/
 cp $OPT FOR_X64_ARM.txt $tmpdir/
 mkdir -p $tmpdir/altexe
 cp $OPT Ventoy2Disk_*.exe $tmpdir/altexe/
+cp $OPT VentoyPlugson_*.exe $tmpdir/altexe/