From 1f3161f3546a760b8ca6693d2fbb2639cd20f7bd Mon Sep 17 00:00:00 2001
From: Mou Ikkai <45863583+Mou-Ikkai@users.noreply.github.com>
Date: Mon, 24 Aug 2020 07:32:25 -0400
Subject: [PATCH] Modernized Shell Script functions.

---
 INSTALL/tool/ventoy_lib.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/INSTALL/tool/ventoy_lib.sh b/INSTALL/tool/ventoy_lib.sh
index 78d93e9c..035b7daa 100644
--- a/INSTALL/tool/ventoy_lib.sh
+++ b/INSTALL/tool/ventoy_lib.sh
@@ -15,7 +15,7 @@ ventoy_true() {
 }
 
 ventoy_is_linux64() {
-    if uname -a | egrep -q 'x86_64|amd64'; then
+    if uname -a | grep -e -q 'x86_64|amd64'; then
         ventoy_true
         return
     fi
@@ -202,14 +202,14 @@ format_ventoy_disk_mbr() {
     part1_start_sector=2048 
     
     if [ $reserve_mb -gt 0 ]; then
-        reserve_sector_num=$(expr $reserve_mb \* 2048)
-        part1_end_sector=$(expr $sector_num - $reserve_sector_num - $VENTOY_SECTOR_NUM - 1)
+        reserve_sector_num=$(($reserve_mb \* 2048))
+        part1_end_sector=$(( $sector_num - $reserve_sector_num - $VENTOY_SECTOR_NUM - 1))
     else
-        part1_end_sector=$(expr $sector_num - $VENTOY_SECTOR_NUM - 1)
+        part1_end_sector=$(($sector_num - $VENTOY_SECTOR_NUM - 1))
     fi
     
-    part2_start_sector=$(expr $part1_end_sector + 1)
-    part2_end_sector=$(expr $part2_start_sector + $VENTOY_SECTOR_NUM - 1)
+    part2_start_sector=$(($part1_end_sector + 1))
+    part2_end_sector=$(($part2_start_sector + $VENTOY_SECTOR_NUM - 1))
 
     export part2_start_sector
 
@@ -317,14 +317,14 @@ format_ventoy_disk_gpt() {
     part1_start_sector=2048 
     
     if [ $reserve_mb -gt 0 ]; then
-        reserve_sector_num=$(expr $reserve_mb \* 2048 + 33)
-        part1_end_sector=$(expr $sector_num - $reserve_sector_num - $VENTOY_SECTOR_NUM - 1)
+        reserve_sector_num=$(($reserve_mb \* 2048 + 33))
+        part1_end_sector=$(($sector_num - $reserve_sector_num - $VENTOY_SECTOR_NUM - 1))
     else
-        part1_end_sector=$(expr $sector_num - $VENTOY_SECTOR_NUM - 34)
+        part1_end_sector=$(($sector_num - $VENTOY_SECTOR_NUM - 34))
     fi
     
-    part2_start_sector=$(expr $part1_end_sector + 1)
-    part2_end_sector=$(expr $part2_start_sector + $VENTOY_SECTOR_NUM - 1)
+    part2_start_sector=$(($part1_end_sector + 1))
+    part2_end_sector=$(($part2_start_sector + $VENTOY_SECTOR_NUM - 1))
 
     export part2_start_sector