diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh index 51b007a53..b53570a37 100644 --- a/usr/lib/archboot/installer/pacman.sh +++ b/usr/lib/archboot/installer/pacman.sh @@ -63,7 +63,7 @@ _install_packages() { _destdir_mounts || return 1 _PACKAGES="" # add packages from archboot defaults - _PACKAGES=$(grep '^_PACKAGES' /etc/archboot/defaults | sed -e 's#_PACKAGES=##g' -e 's#"##g') + _PACKAGES="$(rg -o '^_PACKAGES="(.*)"' -r '$1' /etc/archboot/defaults)" # fallback if _PACKAGES is empty [[ -z "${_PACKAGES}" ]] && _PACKAGES="base linux linux-firmware" _auto_packages diff --git a/usr/lib/archboot/installer/partition.sh b/usr/lib/archboot/installer/partition.sh index 9884b4272..6762a0856 100644 --- a/usr/lib/archboot/installer/partition.sh +++ b/usr/lib/archboot/installer/partition.sh @@ -14,7 +14,7 @@ _check_gpt() { fi if [[ -n "${_GUID_DETECTED}" ]]; then if [[ -n "${_CHECK_BIOS_BOOT_GRUB}" ]]; then - if ! ${_LSBLK} PARTTYPE "${_DISK}" | grep -q '21686148-6449-6E6F-744E-656564454649'; then + if ! ${_LSBLK} PARTTYPE "${_DISK}" | rg -q '21686148-6449-6E6F-744E-656564454649'; then _dialog --msgbox "Setup detected no BIOS BOOT PARTITION in ${_DISK}. Please create a >=1M BIOS BOOT PARTITION for grub BIOS GPT support." 0 0 _RUN_CFDISK=1 fi diff --git a/usr/lib/archboot/installer/quicksetup.sh b/usr/lib/archboot/installer/quicksetup.sh index 990525f08..f33e68976 100644 --- a/usr/lib/archboot/installer/quicksetup.sh +++ b/usr/lib/archboot/installer/quicksetup.sh @@ -70,7 +70,7 @@ _auto_create_filesystems() { # Add check on nvme or mmc controller: # NVME uses /dev/nvme0n1pX name scheme # MMC uses /dev/mmcblk0pX - if echo "${_DISK}" | grep -q "nvme" || echo "${_DISK}" | grep -q "mmc"; then + if echo "${_DISK}" | rg -q "nvme|mmc"; then _DEV="${_DISK}p$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d '|')" fi _FSTYPE="$(echo "${fsspec}" | tr -d ' ' | cut -f2 -d '|')"