Merge branch 'master' of https://github.com/ventoy/Ventoy

[Ventoy.git] / INSTALL / tool / VentoyWorker.sh

diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh
index 6f20a0842d47293b42addf3ef679380fd53dd7e1..ac61997cdc8e3c15f0ef83a500795015594eaf77 100644 (file)
--- a/INSTALL/tool/VentoyWorker.sh
+++ b/INSTALL/tool/VentoyWorker.sh
@@ -3,6 +3,7 @@
 . ./tool/ventoy_lib.sh
 
 print_usage() {
 . ./tool/ventoy_lib.sh
 
 print_usage() {

+    

     echo 'Usage:  Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX'
     echo '  CMD:'
     echo '   -i  install ventoy to sdX (fail if disk already installed with ventoy)'
     echo 'Usage:  Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX'
     echo '  CMD:'
     echo '   -i  install ventoy to sdX (fail if disk already installed with ventoy)'


@@ -33,6 +34,11 @@ while [ -n "$1" ]; do
         RESERVE_SPACE="YES"
         shift
         RESERVE_SIZE_MB=$1
         RESERVE_SPACE="YES"
         shift
         RESERVE_SIZE_MB=$1

+    elif [ "$1" = "-V" ] || [ "$1" = "--version" ]; then
+        exit 0
+    elif [ "$1" == "-h" ] || [ "$1" = "--help" ]; then
+        print_usage
+        exit 0

     else
         if ! [ -b "$1" ]; then
             vterr "$1 is NOT a valid device"
     else
         if ! [ -b "$1" ]; then
             vterr "$1 is NOT a valid device"


@@ -116,7 +122,7 @@ if [ "$MODE" = "install" ]; then
         if parted -v > /dev/null 2>&1; then
             PARTTOOL='parted'
         else
         if parted -v > /dev/null 2>&1; then
             PARTTOOL='parted'
         else

-            vterr "parted is not found in the sysstem, Ventoy can't create new partition."
+            vterr "parted is not found in the system, Ventoy can't create new partition."

             exit 1
         fi
     else
             exit 1
         fi
     else


@@ -125,7 +131,7 @@ if [ "$MODE" = "install" ]; then
         elif fdisk -v >/dev/null 2>&1; then
             PARTTOOL='fdisk'
         else
         elif fdisk -v >/dev/null 2>&1; then
             PARTTOOL='fdisk'
         else

-            vterr "Both parted and fdisk are not found in the sysstem, Ventoy can't create new partition."
+            vterr "Both parted and fdisk are not found in the system, Ventoy can't create new partition."

             exit 1
         fi
     fi
             exit 1
         fi
     fi


@@ -144,7 +150,7 @@ if [ "$MODE" = "install" ]; then
     disk_sector_num=$(cat /sys/block/${DISK#/dev/}/size)
     disk_size_gb=$(expr $disk_sector_num / 2097152)
 
     disk_sector_num=$(cat /sys/block/${DISK#/dev/}/size)
     disk_size_gb=$(expr $disk_sector_num / 2097152)
 

-    if [ $disk_sector_num -gt 4294967296 ]; then
+    if [ $disk_sector_num -gt 4294967296 ] && [ -z "$VTGPT" ]; then

         vterr "$DISK is over 2TB size, MBR will not work on it."
         exit 1
     fi
         vterr "$DISK is over 2TB size, MBR will not work on it."
         exit 1
     fi


@@ -180,7 +186,7 @@ if [ "$MODE" = "install" ]; then
     vtwarn "All the data on the disk $DISK will be lost!!!"
     echo ""
 
     vtwarn "All the data on the disk $DISK will be lost!!!"
     echo ""
 

-    read -p 'Continue? (y/n)'  Answer
+    read -p 'Continue? (y/n) '  Answer

     if [ "$Answer" != "y" ]; then
         if [ "$Answer" != "Y" ]; then
             exit 0
     if [ "$Answer" != "y" ]; then
         if [ "$Answer" != "Y" ]; then
             exit 0


@@ -189,7 +195,7 @@ if [ "$MODE" = "install" ]; then
 
     echo ""
     vtwarn "All the data on the disk $DISK will be lost!!!"
 
     echo ""
     vtwarn "All the data on the disk $DISK will be lost!!!"

-    read -p 'Double-check. Continue? (y/n)'  Answer
+    read -p 'Double-check. Continue? (y/n) '  Answer

     if [ "$Answer" != "y" ]; then
         if [ "$Answer" != "Y" ]; then
             exit 0
     if [ "$Answer" != "y" ]; then
         if [ "$Answer" != "Y" ]; then
             exit 0