From a204ad82d1d69e7ee1c09790aa202bc677b3648d Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 28 Jun 2024 09:32:15 +0200 Subject: [PATCH] replace grep and cut with rg --- usr/lib/archboot/installer/bcachefs.sh | 2 +- usr/lib/archboot/installer/blockdevices.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/lib/archboot/installer/bcachefs.sh b/usr/lib/archboot/installer/bcachefs.sh index 6411096be..bdee1ce91 100644 --- a/usr/lib/archboot/installer/bcachefs.sh +++ b/usr/lib/archboot/installer/bcachefs.sh @@ -49,7 +49,7 @@ _bcfs_select_raid_devices () { _BCFS_RAID_DEVS="" #shellcheck disable=SC2001,SC2086 for i in ${_DEVS}; do - echo "${i}" | rg -q /dev && _BCFS_RAID_DEVS="${_BCFS_RAID_DEVS} ${i} _ " + echo "${i}" | rg -q '/dev' && _BCFS_RAID_DEVS="${_BCFS_RAID_DEVS} ${i} _ " done _BCFS_RAID_DEVS=${_BCFS_RAID_DEVS//${_BCFS_RAID_DEV} _/} _RAIDNUMBER=1 diff --git a/usr/lib/archboot/installer/blockdevices.sh b/usr/lib/archboot/installer/blockdevices.sh index c2a5f84dc..f39a5847d 100644 --- a/usr/lib/archboot/installer/blockdevices.sh +++ b/usr/lib/archboot/installer/blockdevices.sh @@ -130,7 +130,7 @@ _partitionable_raid_devices_partitions() { _dmraid_devices() { # ddf_raid_member or isw_raid_member, managed by mdadm - for dev in $(${_LSBLK} NAME,TYPE | rg "(.*) raid.*$" -r '$1' | sort -u); do + for dev in $(${_LSBLK} NAME,TYPE | rg '(.*) raid.*$' -r '$1' | sort -u); do if ${_LSBLK} NAME,FSTYPE -s "${dev}" 2>"${_NO_LOG}" | rg -q 'ddf_raid_member$|isw_raid_member$'; then ${_LSBLK} NAME,SIZE -d "${dev}" fi @@ -139,7 +139,7 @@ _dmraid_devices() { _dmraid_partitions() { # ddf_raid_member or isw_raid_member, managed by mdadm - for dev in $(${_LSBLK} NAME,TYPE | rg "(.*) md$" -r '$1' | sort -u); do + for dev in $(${_LSBLK} NAME,TYPE | rg '(.*) md$' -r '$1' | sort -u); do if ${_LSBLK} NAME,FSTYPE -s "${dev}" 2>"${_NO_LOG}" | rg 'ddf_raid_member$|isw_raid_member$'; then ${_LSBLK} NAME,SIZE -d "${dev}" fi