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 with rg

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-28 22:10:36 +02:00
parent 7d7456f5c5
commit a8d8dbda96
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
usr/lib/archboot/installer/bootloader.sh
View file

@ -37,11 +37,11 @@ _getcryptsetup() {
if ! cryptsetup status "$(basename "${_ROOTDEV}")" | rg -q 'inactive'; then if ! cryptsetup status "$(basename "${_ROOTDEV}")" | rg -q 'inactive'; then
if cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}"; then if cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}"; then
if [[ "${_NAME_SCHEME_PARAMETER}" == "FSUUID" ]]; then if [[ "${_NAME_SCHEME_PARAMETER}" == "FSUUID" ]]; then
_LUKSDEV="UUID=$(${_LSBLK} UUID "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')" 2>"${_NO_LOG}")" _LUKSDEV="UUID=$(${_LSBLK} UUID "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | rg -o 'device: (.*)' -r '$1')" 2>"${_NO_LOG}")"
elif [[ "${_NAME_SCHEME_PARAMETER}" == "FSLABEL" ]]; then elif [[ "${_NAME_SCHEME_PARAMETER}" == "FSLABEL" ]]; then
_LUKSDEV="LABEL=$(${_LSBLK} LABEL "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')" 2>"${_NO_LOG}")" _LUKSDEV="LABEL=$(${_LSBLK} LABEL "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | rg -o 'device: (.*)' -r '$1')" 2>"${_NO_LOG}")"
else else
_LUKSDEV="$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g'))" _LUKSDEV="$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | rg -o 'device: (.*)' -r '$1')"
fi fi
_LUKSNAME="$(basename "${_ROOTDEV}")" _LUKSNAME="$(basename "${_ROOTDEV}")"
_LUKSSETUP="cryptdevice=${_LUKSDEV}:${_LUKSNAME}" _LUKSSETUP="cryptdevice=${_LUKSDEV}:${_LUKSNAME}"
@ -155,7 +155,8 @@ _uefi_common() {
} }
_uefi_efibootmgr() { _uefi_efibootmgr() {
for _bootnum in $(efibootmgr | rg '^Boot[0-9]' | grep -F -i "${_BOOTMGR_LABEL}" | cut -b5-8) ; do # delete existing entry
for _bootnum in $(efibootmgr | rg -F -i "${_BOOTMGR_LABEL}" | rg -o '^Boot(\d+)' -r '$1'); do
efibootmgr --quiet -b "${_bootnum}" -B >> "${_LOG}" efibootmgr --quiet -b "${_bootnum}" -B >> "${_LOG}"
done done
_BOOTMGRDEV=$(${_LSBLK} PKNAME "${_UEFISYSDEV}" 2>"${_NO_LOG}") _BOOTMGRDEV=$(${_LSBLK} PKNAME "${_UEFISYSDEV}" 2>"${_NO_LOG}")

6
usr/lib/archboot/installer/bootloader_grub.sh
View file

@ -60,16 +60,16 @@ _grub_config() {
_SUBDIR="/boot" _SUBDIR="/boot"
# on btrfs we need to check on subvol # on btrfs we need to check on subvol
if mount | rg -q "${_DESTDIR} type btrfs .*subvol"; then if mount | rg -q "${_DESTDIR} type btrfs .*subvol"; then
_SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/" | grep Name | cut -c 11-60)"/boot _SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/" | rg -o 'Name: +\t+(.*)' -r '$1')"/boot
fi fi
if mount | rg -q "${_DESTDIR}/boot type btrfs .*subvol"; then if mount | rg -q "${_DESTDIR}/boot type btrfs .*subvol"; then
_SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/boot" | grep Name | cut -c 11-60)" _SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/boot" | rg -o 'Name: +\t+(.*)' -r '$1')"
fi fi
else else
_SUBDIR="" _SUBDIR=""
# on btrfs we need to check on subvol # on btrfs we need to check on subvol
if mount | rg -q "${_DESTDIR}/boot type btrfs .*subvol"; then if mount | rg -q "${_DESTDIR}/boot type btrfs .*subvol"; then
_SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/boot" | grep Name | cut -c 11-60)" _SUBDIR="/$(btrfs subvolume show "${_DESTDIR}/boot" | rg -o 'Name: +\t+(.*)' -r '$1')"
fi fi
fi fi
## Move old config file, if any ## Move old config file, if any