From 676ae725aecbddf9b1dcb2909c00c0d474edbefe Mon Sep 17 00:00:00 2001 From: longpanda Date: Wed, 21 Dec 2022 19:59:16 +0800 Subject: [PATCH] Fix the egrep warning. (#2083) --- INSTALL/Ventoy2Disk.sh | 6 +++--- INSTALL/VentoyPlugson.sh | 10 +++++----- INSTALL/VentoyWeb.sh | 6 +++--- INSTALL/tool/VentoyWorker.sh | 4 ++-- Vlnk/VentoyVlnk.sh | 16 ++++++++-------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/INSTALL/Ventoy2Disk.sh b/INSTALL/Ventoy2Disk.sh index dac5c2f5..f08ab109 100644 --- a/INSTALL/Ventoy2Disk.sh +++ b/INSTALL/Ventoy2Disk.sh @@ -12,11 +12,11 @@ if [ -f ./ventoy/version ]; then curver=$(cat ./ventoy/version) fi -if uname -m | egrep -q 'aarch64|arm64'; then +if uname -m | grep -E -q 'aarch64|arm64'; then export TOOLDIR=aarch64 -elif uname -m | egrep -q 'x86_64|amd64'; then +elif uname -m | grep -E -q 'x86_64|amd64'; then export TOOLDIR=x86_64 -elif uname -m | egrep -q 'mips64'; then +elif uname -m | grep -E -q 'mips64'; then export TOOLDIR=mips64el else export TOOLDIR=i386 diff --git a/INSTALL/VentoyPlugson.sh b/INSTALL/VentoyPlugson.sh index 5394a36f..0f2d0b39 100644 --- a/INSTALL/VentoyPlugson.sh +++ b/INSTALL/VentoyPlugson.sh @@ -30,13 +30,13 @@ fi OLDDIR=$(pwd) machine=$(uname -m) -if echo $machine | egrep -q 'aarch64|arm64'; then +if echo $machine | grep -E -q 'aarch64|arm64'; then TOOLDIR=aarch64 -elif echo $machine | egrep -q 'x86_64|amd64'; then +elif echo $machine | grep -E -q 'x86_64|amd64'; then TOOLDIR=x86_64 -elif echo $machine | egrep -q 'mips64'; then +elif echo $machine | grep -E -q 'mips64'; then TOOLDIR=mips64el -elif echo $machine | egrep -q 'i[3-6]86'; then +elif echo $machine | grep -E -q 'i[3-6]86'; then TOOLDIR=i386 else echo "Unsupported machine type $machine" @@ -122,7 +122,7 @@ if echo $DISK | grep -q "[a-z]d[a-z][1-9]"; then DISK=${DISK:0:-1} fi -if echo $DISK | egrep -q "/dev/nvme|/dev/mmcblk/dev/nbd"; then +if echo $DISK | grep -E -q "/dev/nvme|/dev/mmcblk/dev/nbd"; then if echo $DISK | grep -q "p[1-9]$"; then DISK=${DISK:0:-2} fi diff --git a/INSTALL/VentoyWeb.sh b/INSTALL/VentoyWeb.sh index f06ae066..537348aa 100644 --- a/INSTALL/VentoyWeb.sh +++ b/INSTALL/VentoyWeb.sh @@ -23,11 +23,11 @@ fi OLDDIR=$(pwd) -if uname -m | egrep -q 'aarch64|arm64'; then +if uname -m | grep -E -q 'aarch64|arm64'; then TOOLDIR=aarch64 -elif uname -m | egrep -q 'x86_64|amd64'; then +elif uname -m | grep -E -q 'x86_64|amd64'; then TOOLDIR=x86_64 -elif uname -m | egrep -q 'mips64'; then +elif uname -m | grep -E -q 'mips64'; then TOOLDIR=mips64el else TOOLDIR=i386 diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh index c148f8c8..2d18b607 100644 --- a/INSTALL/tool/VentoyWorker.sh +++ b/INSTALL/tool/VentoyWorker.sh @@ -434,7 +434,7 @@ elif [ "$MODE" = "install" -a -n "$NONDESTRUCTIVE" ]; then PART1_BLKID=$(blkid $PART1) blkid $PART1 - if echo $PART1_BLKID | egrep -q -i 'TYPE=ntfs|TYPE=.ntfs'; then + if echo $PART1_BLKID | grep -E -q -i 'TYPE=ntfs|TYPE=.ntfs'; then echo "Partition 1 contains NTFS filesystem" which ntfsresize @@ -452,7 +452,7 @@ elif [ "$MODE" = "install" -a -n "$NONDESTRUCTIVE" ]; then echo "###[FAIL] ntfsresize failed." exit 1 fi - elif echo $PART1_BLKID | egrep -q -i 'TYPE=ext[2-4]|TYPE=.ext[2-4]'; then + elif echo $PART1_BLKID | grep -E -q -i 'TYPE=ext[2-4]|TYPE=.ext[2-4]'; then echo "Partition 1 contains EXT filesystem" which resize2fs diff --git a/Vlnk/VentoyVlnk.sh b/Vlnk/VentoyVlnk.sh index e242d071..c0b83a76 100644 --- a/Vlnk/VentoyVlnk.sh +++ b/Vlnk/VentoyVlnk.sh @@ -19,7 +19,7 @@ vlog() { } vlnk_suffix() { - echo $1 | egrep -q '.*(.vlnk.iso|.vlnk.img|.vlnk.wim|.vlnk.vhd|.vlnk.vhdx|.vlnk.efi|.vlnk.vtoy|.vlnk.dat)$' + echo $1 | grep -E -q '.*(.vlnk.iso|.vlnk.img|.vlnk.wim|.vlnk.vhd|.vlnk.vhdx|.vlnk.efi|.vlnk.vtoy|.vlnk.dat)$' } @@ -38,13 +38,13 @@ for t in 'mountpoint' 'readlink' 'xzcat'; do done machine=$(uname -m) -if echo $machine | egrep -q 'aarch64|arm64'; then +if echo $machine | grep -E -q 'aarch64|arm64'; then TOOLDIR=aarch64 -elif echo $machine | egrep -q 'x86_64|amd64'; then +elif echo $machine | grep -E -q 'x86_64|amd64'; then TOOLDIR=x86_64 -elif echo $machine | egrep -q 'mips64'; then +elif echo $machine | grep -E -q 'mips64'; then TOOLDIR=mips64el -elif echo $machine | egrep -q 'i[3-6]86'; then +elif echo $machine | grep -E -q 'i[3-6]86'; then TOOLDIR=i386 else echo "Unsupported machine type $machine" @@ -103,7 +103,7 @@ if [ "$CMD" = "c" ]; then exit 1 fi - if echo $IMG | egrep -q -i '.*(.iso|.img|.wim|.vhd|.vhdx|.efi|.vtoy|.dat)$'; then + if echo $IMG | grep -E -q -i '.*(.iso|.img|.wim|.vhd|.vhdx|.efi|.vtoy|.dat)$'; then : else echo "This file is not supported for vlnk!" @@ -157,7 +157,7 @@ if [ "$CMD" = "c" ]; then FS=$(grep " ${FULLDIR} " /proc/mounts | awk '{print $3}') vlog "File system of $DEV is $FS" - if echo $FS | egrep -q "ext2|ext3|ext4|exfat|vfat|fat32|fat16|fat12|ntfs|xfs|udf"; then + if echo $FS | grep -E -q "ext2|ext3|ext4|exfat|vfat|fat32|fat16|fat12|ntfs|xfs|udf"; then vlog "FS OK" elif [ "$FS" = "fuseblk" ]; then vlog "$DEV is fuseblk" @@ -203,7 +203,7 @@ if [ "$CMD" = "c" ]; then if [ -f "/sys/class/block/$IMGPARTITION/start" ]; then PARTSTART=$(cat "/sys/class/block/$IMGPARTITION/start") - if echo $IMGPARTITION | egrep -q 'mmc|nbd|nvme'; then + if echo $IMGPARTITION | grep -E -q 'mmc|nbd|nvme'; then DISK=$(echo /dev/$IMGPARTITION | sed "s/^\(.*\)p[0-9][0-9]*$/\1/") else DISK=$(echo /dev/$IMGPARTITION | sed "s/^\(.*[^0-9]\)[0-9][0-9]*$/\1/")