Removes image hints. Fixes Haiku OS ignore path.

MH-USB/OS/debian-11.2.0-amd64-netinst.iso.sha256

@@ -0,0 +1 @@
+45c9feabba213bdc6d72e7469de71ea5aeff73faea6bfb109ab5bad37c3b43bd  debian-11.2.0-amd64-netinst.iso

MH-USB/OS/guix-system-install-1.3.0.x86_64-linux.iso.sha256

@@ -1 +1 @@
-e31504823e5fbf4160e45bf811ae507053de62e55ebfdac03295566c077e8a79  guix-system-install-1.3.0.x86_64-linux.iso
+f2b30458fa1736eeee3b82f34aab1d72f3964bef0477329bb75281d2b7bb6d4b  guix-system-install-1.3.0.x86_64-linux.iso

MH-USB/OS/manjaro-kde-21.2.1-220103-linux515.iso.sha256

@@ -1 +0,0 @@
-521ff8c9a2834ae8ecfb7659d98b53d6d525909bbe52d6eedab57f667f9ae102  manjaro-kde-21.2.1-220103-linux515.iso

MH-USB/OS/manjaro-kde-21.2.2-220123-linux515.iso.sha256

@@ -0,0 +1 @@
+cf4c4e1df9c29eabf1a2015efd911d48745d33827a8cbef413868af023e20ff4  manjaro-kde-21.2.2-220123-linux515.iso

MH-USB/OS/proxmox-ve_7.1-2.iso.sha256

@@ -1 +1 @@
-8fce5e18056b49000c3bfbb8c90fe4c5679bb3719e656fedd1505597a5115af4  proxmox-ve_7.1-2.iso
+f469d2e419328c4b8715544c84f629161cc07024ce26ad63f00bc1b07de265df  proxmox-ve_7.1-2.iso

MH-USB/OS/trisquel-mini_10.0_amd64.iso.sha256

@@ -0,0 +1 @@
+d1c677b3ebd6c7c78ad8a2b0a6d79a4ae9bf0a8323f6b2e87979a3b75940decd  trisquel-mini_10.0_amd64.iso

MH-USB/OS/trisquel-mini_9.0.1_amd64.iso.sha256

@@ -1 +0,0 @@
-7698606052f46938db20932983f5d3c07c3b1e3abd97b79753e5fafcf88914a7  trisquel-mini_9.0.1_amd64.iso

MH-USB/OS/zdebian-firmware-11.2.0-amd64-netinst.iso.sha256

@@ -0,0 +1 @@
+ce5e3e3dc51885128c38e31e24778d9a4d5483d8fe3f818e116d712f5764ea5e  debian-firmware-11.2.0-amd64-netinst.iso

MH-USB/Tools/balenaEtcher-1.7.3-x64.AppImage.sha256

@@ -0,0 +1 @@
+b2432729ad79e6aa1d6292465db065b078b627c5ec6ddedea8580434088cb74f  balenaEtcher-1.7.3-x64.AppImage

MH-USB/Tools/balenaEtcher-Portable-1.7.3.exe.sha256

@@ -0,0 +1 @@
+8959214447a7848cbe821372f13f157265c2f24b88fc5947555a21e102b91392  balenaEtcher-Portable-1.7.3.exe

MH-USB/Tools/ungoogled-chromium_91.0.4472.164-1.1.AppImage.sha256

@@ -0,0 +1 @@
+7bd79ffd8d676c2bab96355e368278529167a5a06b64da84df082c5ceed74e29  ungoogled-chromium_91.0.4472.164-1.1.AppImage

MH-USB/ventoy/ventoy.json

@@ -9,7 +9,7 @@
         ]
     },
     "image_blacklist": [
-      "/haiku-r1beta3-x86_64-anyboot.iso"
+      "/OS/haiku-r1beta3-x86_64-anyboot.iso"
     ],
     "menu_alias": [
         {
@@ -20,6 +20,10 @@
             "image": "/OS/debian-live-11.2.0-amd64-cinnamon.iso",
             "alias": "Debian 11.2.0 (Live)"
         },
+        {
+            "image": "/OS/debian-11.2.0-amd64-netinst.iso",
+            "alias": "Debian 11.2.0 (Network Installer) [Main]"
+        },
         {
             "image": "/OS/devuan_chimaera_4.0.0_amd64_desktop-live.iso",
             "alias": "Devuan Chimaera 4.0.0 (live)"
@@ -41,7 +45,11 @@
             "alias": "Manjaro KDE 21.2.1 (Live)"
         },
         {
-            "image": "/netboot.xyz.iso",
+            "image": "/OS/manjaro-kde-21.2.2-220123-linux515.iso",
+            "alias": "Manjaro KDE 21.2.2 (Live)"
+        },
+        {
+            "image": "/OS/netboot.xyz.iso",
             "alias": "Netboot.xyz"
         },
         {
@@ -69,29 +77,18 @@
             "alias": "Tails 4.26 (Live)"
         },
         {
-            "image": "/OS/trisquel-mini_9.0.1_amd64.iso",
-            "alias": "Trisquel 9.0.1 (Live)"
+            "image": "/OS/trisquel-mini_10.0_amd64.iso",
+            "alias": "Trisquel 10.0 (Live)"
         },
         {
             "image": "/OS/ubuntu-20.04.3-desktop-amd64.iso",
             "alias": "Ubuntu Desktop 20.04.3 (Live)"
+        },
+        {
+            "image": "/OS/zdebian-firmware-11.2.0-amd64-netinst.iso",
+            "alias": "Debian 11.2.0 (Network Installer) [With Firmware]"
         }
     ],
-    "menu_tip":{
-        "left": "25%",
-        "top": "91%",
-        "color": "black",
-        "tips":[
-            {
-                "image": "/OS/ubuntu-20.04.3-desktop-amd64.iso",
-                "tip": "The Ubuntu Desktop 20.04 LTS Live bootable OS"
-            },
-            {
-                "image": "/OS/debian-live-11.2.0-amd64-cinnamon.iso",
-                "tip": "The Debian GNU/Linux Desktop (Cinnamon) Live bootable OS"
-            }
-        ]
-    },
     "menu_class":[
         {
             "key": "alpine",

prepare-usb.sh

@@ -1,12 +1,22 @@
-#!/bin/bash
+#!/bin/bash 
 
 usb=$1
+size=$2
 part=`echo $usb`1
 rsync="rsync --delete -rvtDW --progress --modify-window=1"
 
-if [ -z $1 ]
+if [ -z $usb -o -z $size ]
 then
-  echo "Usage: sudo ./prepare-usb.sh <device>"
+  echo "Usage: sudo ./prepare-usb.sh <device> <size>"
+  exit 1
+fi
+
+if [ $size -eq 16 -o $size -eq 32 ]
+then
+  echo "Working with $size GB disk..."
+else
+  echo "Usage: sudo ./prepare-usb.sh <device> <size>"
+  echo "       <size> should be 16 or 32"
   exit 1
 fi
 
@@ -17,31 +27,61 @@ then
   exit 1
 fi
 
-## Install Ventoy
-ventoy -i /dev/$usb -L MH-USB -I -g
-sleep 20
-
 OS_FOR_16GB="
-  alpine-standard-3.15.0-x86_64.iso
-  debian-live-11.2.0-amd64-cinnamon.iso
-  Fedora-Workstation-Live-x86_64-35-1.2.iso
-  LibreELEC-Generic.x86_64-10.0.1.img
-  manjaro-kde-21.2.1-minimal-220103-linux515.iso
-  netboot.xyz.iso
-  openwrt-21.02.0-x86-64-generic-ext4-combined.img
-  systemrescue-9.00-amd64.iso
-  tails-amd64-4.26.img
-  trisquel-mini_9.0.1_amd64.iso
-  ubuntu-20.04.3-desktop-amd64.iso"
-
-RPi_FOR_16GB="
+  alpine-standard-3.15.0-x86_64.iso*
+  debian-11.2.0-amd64-netinst.iso*
+  zdebian-firmware-11.2.0-amd64-netinst.iso*
+  Fedora-Workstation-Live-x86_64-35-1.2.iso*
+  guix-system-install-1.3.0.x86_64-linux.iso*
+  LibreELEC-Generic.x86_64-10.0.1.img*
+  manjaro-kde-21.2.1-minimal-220103-linux515.iso*
+  netboot.xyz.iso*
+  openwrt-21.02.0-x86-64-generic-ext4-combined.img*
+  proxmox-ve_7.1-2.iso*
+  systemrescue-9.00-amd64.iso*
+  tails-amd64-4.26.img*
+  trisquel-mini_10.0_amd64.iso*
+  ubuntu-20.04.3-desktop-amd64.iso*"
+
+OS_FOR_32GB="
+  alpine-standard-3.15.0-x86_64.iso*
+  debian-11.2.0-amd64-netinst.iso*
+  devuan_chimaera_4.0.0_amd64_desktop-live.iso*
+  zdebian-firmware-11.2.0-amd64-netinst.iso*
+  Fedora-Workstation-Live-x86_64-35-1.2.iso*
+  guix-system-install-1.3.0.x86_64-linux.iso*
+  haiku-r1beta3-x86_64-anyboot.iso*
+  LibreELEC-Generic.x86_64-10.0.1.img*
+  manjaro-kde-21.2.2-220123-linux515.iso*
+  netboot.xyz.iso*
+  openwrt-21.02.0-x86-64-generic-ext4-combined.img*
+  proxmox-ve_7.1-2.iso*
+  Qubes-R4.0.4-x86_64.iso*
+  systemrescue-9.00-amd64.iso*
+  tails-amd64-4.26.img*
+  trisquel-mini_10.0_amd64.iso*
+  ubuntu-20.04.3-desktop-amd64.iso*"
+
+RPi="
   2021-10-30-raspios-bullseye-armhf-lite.zip
   LibreELEC-RPi4.arm-10.0.1.img.gz"
 
-TOOLS_FOR_16GB="
-  imager_1.6.1.exe
-  imager_amd64.AppImage
-  ungoogled-chromium_91.0.4472.164-1.1.AppImage"
+TOOLS="
+  balenaEtcher-1.7.3-x64.AppImage*
+  balenaEtcher-Portable-1.7.3.exe*
+  ungoogled-chromium_91.0.4472.164-1.1.AppImage*"
+
+## Install Ventoy
+if [ $size -eq 16 ]
+then
+  ventoy -i /dev/$usb -L MH-USB -I -g
+  sleep 20
+  OS=$OS_FOR_16GB
+else
+  ventoy -i /dev/$usb -L MH-USB -I -g -r 1500
+  sleep 20
+  OS=$OS_FOR_32GB
+fi
 
 ## Copy ISOs
 mkdir -p /mnt/mhusb/
@@ -49,15 +89,19 @@ mount /dev/$part /mnt/mhusb
 mkdir -p /mnt/mhusb/{OS,Tools}
 
 cd MH-USB/OS/
-time $rsync $OS_FOR_16GB /mnt/mhusb/OS/
+time $rsync $OS /mnt/mhusb/OS/
 
 cd ../Tools/
-time $rsync $TOOLS_FOR_16GB /mnt/mhusb/Tools/
+time $rsync $TOOLS /mnt/mhusb/Tools/
 
 cd ../
 time $rsync ventoy /mnt/mhusb
 
-## cd ../RPi/
-## $rsync  $RPi_FOR_16GB /mnt/mhusb/RPi/
+if [ $size -eq 32 ]
+then
+  cd RPi/
+  mkdir -p /mnt/mhusb/RPi/
+  $rsync $RPi /mnt/mhusb/RPi/
+fi
 
 echo "Done."