root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

replace grep and cut with rg

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-28 09:32:15 +02:00
parent ebdafe55ea
commit a204ad82d1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/installer/bcachefs.sh
View file

@ -49,7 +49,7 @@ _bcfs_select_raid_devices () {
_BCFS_RAID_DEVS="" _BCFS_RAID_DEVS=""
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
for i in ${_DEVS}; do 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 done
_BCFS_RAID_DEVS=${_BCFS_RAID_DEVS//${_BCFS_RAID_DEV} _/} _BCFS_RAID_DEVS=${_BCFS_RAID_DEVS//${_BCFS_RAID_DEV} _/}
_RAIDNUMBER=1 _RAIDNUMBER=1

4
usr/lib/archboot/installer/blockdevices.sh
View file

@ -130,7 +130,7 @@ _partitionable_raid_devices_partitions() {
_dmraid_devices() { _dmraid_devices() {
# ddf_raid_member or isw_raid_member, managed by mdadm # 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 if ${_LSBLK} NAME,FSTYPE -s "${dev}" 2>"${_NO_LOG}" | rg -q 'ddf_raid_member$|isw_raid_member$'; then
${_LSBLK} NAME,SIZE -d "${dev}" ${_LSBLK} NAME,SIZE -d "${dev}"
fi fi
@ -139,7 +139,7 @@ _dmraid_devices() {
_dmraid_partitions() { _dmraid_partitions() {
# ddf_raid_member or isw_raid_member, managed by mdadm # 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 if ${_LSBLK} NAME,FSTYPE -s "${dev}" 2>"${_NO_LOG}" | rg 'ddf_raid_member$|isw_raid_member$'; then
${_LSBLK} NAME,SIZE -d "${dev}" ${_LSBLK} NAME,SIZE -d "${dev}"
fi fi