Archives
/
Ventoy
mirror of https://github.com/ventoy/Ventoy
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the egrep warning. (#2083)

Browse Source
pull/2085/head
longpanda 1 year ago
parent 54dd35d277
commit 676ae725ae
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

6
INSTALL/Ventoy2Disk.sh
Unescape Escape View File

@ -12,11 +12,11 @@ if [ -f ./ventoy/version ]; then
curver=$(cat ./ventoy/version) curver=$(cat ./ventoy/version)
fi fi
if uname -m | egrep -q 'aarch64|arm64'; then if uname -m | grep -E -q 'aarch64|arm64'; then
export TOOLDIR=aarch64 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 export TOOLDIR=x86_64
elif uname -m | egrep -q 'mips64'; then elif uname -m | grep -E -q 'mips64'; then
export TOOLDIR=mips64el export TOOLDIR=mips64el
else else
export TOOLDIR=i386 export TOOLDIR=i386

10
INSTALL/VentoyPlugson.sh
Unescape Escape View File

@ -30,13 +30,13 @@ fi
OLDDIR=$(pwd) OLDDIR=$(pwd)
machine=$(uname -m) machine=$(uname -m)
if echo $machine | egrep -q 'aarch64|arm64'; then if echo $machine | grep -E -q 'aarch64|arm64'; then
TOOLDIR=aarch64 TOOLDIR=aarch64
elif echo $machine | egrep -q 'x86_64|amd64'; then elif echo $machine | grep -E -q 'x86_64|amd64'; then
TOOLDIR=x86_64 TOOLDIR=x86_64
elif echo $machine | egrep -q 'mips64'; then elif echo $machine | grep -E -q 'mips64'; then
TOOLDIR=mips64el 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 TOOLDIR=i386
else else
echo "Unsupported machine type $machine" 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} DISK=${DISK:0:-1}
fi 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 if echo $DISK | grep -q "p[1-9]$"; then
DISK=${DISK:0:-2} DISK=${DISK:0:-2}
fi fi

6
INSTALL/VentoyWeb.sh
Unescape Escape View File

@ -23,11 +23,11 @@ fi
OLDDIR=$(pwd) OLDDIR=$(pwd)
if uname -m | egrep -q 'aarch64|arm64'; then if uname -m | grep -E -q 'aarch64|arm64'; then
TOOLDIR=aarch64 TOOLDIR=aarch64
elif uname -m | egrep -q 'x86_64|amd64'; then elif uname -m | grep -E -q 'x86_64|amd64'; then
TOOLDIR=x86_64 TOOLDIR=x86_64
elif uname -m | egrep -q 'mips64'; then elif uname -m | grep -E -q 'mips64'; then
TOOLDIR=mips64el TOOLDIR=mips64el
else else
TOOLDIR=i386 TOOLDIR=i386

4
INSTALL/tool/VentoyWorker.sh
Unescape Escape View File

@ -434,7 +434,7 @@ elif [ "$MODE" = "install" -a -n "$NONDESTRUCTIVE" ]; then
PART1_BLKID=$(blkid $PART1) PART1_BLKID=$(blkid $PART1)
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" echo "Partition 1 contains NTFS filesystem"
which ntfsresize which ntfsresize
@ -452,7 +452,7 @@ elif [ "$MODE" = "install" -a -n "$NONDESTRUCTIVE" ]; then
echo "###[FAIL] ntfsresize failed." echo "###[FAIL] ntfsresize failed."
exit 1 exit 1
fi 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" echo "Partition 1 contains EXT filesystem"
which resize2fs which resize2fs

16
Vlnk/VentoyVlnk.sh
Unescape Escape View File

@ -19,7 +19,7 @@ vlog() {
} }
vlnk_suffix() { 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 done
machine=$(uname -m) machine=$(uname -m)
if echo $machine | egrep -q 'aarch64|arm64'; then if echo $machine | grep -E -q 'aarch64|arm64'; then
TOOLDIR=aarch64 TOOLDIR=aarch64
elif echo $machine | egrep -q 'x86_64|amd64'; then elif echo $machine | grep -E -q 'x86_64|amd64'; then
TOOLDIR=x86_64 TOOLDIR=x86_64
elif echo $machine | egrep -q 'mips64'; then elif echo $machine | grep -E -q 'mips64'; then
TOOLDIR=mips64el 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 TOOLDIR=i386
else else
echo "Unsupported machine type $machine" echo "Unsupported machine type $machine"
@ -103,7 +103,7 @@ if [ "$CMD" = "c" ]; then
exit 1 exit 1
fi 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 else
echo "This file is not supported for vlnk!" echo "This file is not supported for vlnk!"
@ -157,7 +157,7 @@ if [ "$CMD" = "c" ]; then
FS=$(grep " ${FULLDIR} " /proc/mounts | awk '{print $3}') FS=$(grep " ${FULLDIR} " /proc/mounts | awk '{print $3}')
vlog "File system of $DEV is $FS" 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" vlog "FS OK"
elif [ "$FS" = "fuseblk" ]; then elif [ "$FS" = "fuseblk" ]; then
vlog "$DEV is fuseblk" vlog "$DEV is fuseblk"
@ -203,7 +203,7 @@ if [ "$CMD" = "c" ]; then
if [ -f "/sys/class/block/$IMGPARTITION/start" ]; then if [ -f "/sys/class/block/$IMGPARTITION/start" ]; then
PARTSTART=$(cat "/sys/class/block/$IMGPARTITION/start") 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/") DISK=$(echo /dev/$IMGPARTITION | sed "s/^\(.*\)p[0-9][0-9]*$/\1/")
else else
DISK=$(echo /dev/$IMGPARTITION | sed "s/^\(.*[^0-9]\)[0-9][0-9]*$/\1/") DISK=$(echo /dev/$IMGPARTITION | sed "s/^\(.*[^0-9]\)[0-9][0-9]*$/\1/")

Write Preview
Loading…
Cancel
Save