mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
replace grep with rg
This commit is contained in:
parent
d401a59d28
commit
72c7c347e3
3 changed files with 3 additions and 3 deletions
|
@ -63,7 +63,7 @@ _install_packages() {
|
||||||
_destdir_mounts || return 1
|
_destdir_mounts || return 1
|
||||||
_PACKAGES=""
|
_PACKAGES=""
|
||||||
# add packages from archboot defaults
|
# 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
|
# fallback if _PACKAGES is empty
|
||||||
[[ -z "${_PACKAGES}" ]] && _PACKAGES="base linux linux-firmware"
|
[[ -z "${_PACKAGES}" ]] && _PACKAGES="base linux linux-firmware"
|
||||||
_auto_packages
|
_auto_packages
|
||||||
|
|
|
@ -14,7 +14,7 @@ _check_gpt() {
|
||||||
fi
|
fi
|
||||||
if [[ -n "${_GUID_DETECTED}" ]]; then
|
if [[ -n "${_GUID_DETECTED}" ]]; then
|
||||||
if [[ -n "${_CHECK_BIOS_BOOT_GRUB}" ]]; 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
|
_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
|
_RUN_CFDISK=1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -70,7 +70,7 @@ _auto_create_filesystems() {
|
||||||
# Add check on nvme or mmc controller:
|
# Add check on nvme or mmc controller:
|
||||||
# NVME uses /dev/nvme0n1pX name scheme
|
# NVME uses /dev/nvme0n1pX name scheme
|
||||||
# MMC uses /dev/mmcblk0pX
|
# 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 '|')"
|
_DEV="${_DISK}p$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d '|')"
|
||||||
fi
|
fi
|
||||||
_FSTYPE="$(echo "${fsspec}" | tr -d ' ' | cut -f2 -d '|')"
|
_FSTYPE="$(echo "${fsspec}" | tr -d ' ' | cut -f2 -d '|')"
|
||||||
|
|
Loading…
Reference in a new issue