diff --git a/usr/bin/archboot-fw-check.sh b/usr/bin/archboot-fw-check.sh index c1c264728..5abe380e2 100755 --- a/usr/bin/archboot-fw-check.sh +++ b/usr/bin/archboot-fw-check.sh @@ -22,7 +22,7 @@ cp firmware.txt firmware.orig.txt while read -r i; do sed -i -e "s#${i}##g" firmware.txt done < modules.txt -grep -v -E 'amd|amss|atmel|ath[0-9]|board-2|brcm|cs42l43|htc_*|i915|imx|intel|iwlwifi|libertas|m3\.bin|mediatek|mrvl|mwl.*|mt7650|nvidia|radeon|regdb|rsi|rt[0-9][0-9]*|rtl|rtw8[8-9]|slicoss|ti-connect|ti_*|vpu_*|/.zst' firmware.txt > fw-error.txt +rg -v 'amd|amss|atmel|ath[0-9]|board-2|brcm|cs42l43|htc_*|i915|imx|intel|iwlwifi|libertas|m3\.bin|mediatek|mrvl|mwl.*|mt7650|nvidia|radeon|regdb|rsi|rt[0-9][0-9]*|rtl|rtw8[8-9]|slicoss|ti-connect|ti_*|vpu_*|/.zst' firmware.txt > fw-error.txt if [[ -s fw-error.txt ]]; then exit 1 fi diff --git a/usr/bin/archboot-hwsim.sh b/usr/bin/archboot-hwsim.sh index 69788e916..15bed34e1 100755 --- a/usr/bin/archboot-hwsim.sh +++ b/usr/bin/archboot-hwsim.sh @@ -26,7 +26,7 @@ _pacman_keyring echo "Installing kernel..." pacman -Sydd --noconfirm --noscriptlet linux &>"${_LOG}" depmod -a -if ! grep -qw mac80211_hwsim /proc/modules; then +if ! rg -qw 'mac80211_hwsim' /proc/modules; then modprobe mac80211_hwsim fi iwctl ap wlan0 stop diff --git a/usr/bin/archboot-launcher.sh b/usr/bin/archboot-launcher.sh index e51927d89..c920484c5 100755 --- a/usr/bin/archboot-launcher.sh +++ b/usr/bin/archboot-launcher.sh @@ -6,17 +6,17 @@ _TITLE="archboot.com | ${_RUNNING_ARCH} | ${_RUNNING_KERNEL} | Basic Setup | Lau _check_desktop() { _DESKTOP=() - update | grep -q Gnome && _DESKTOP+=( "gnome" "Simple Beautiful Elegant" ) - update | grep -q KDE && _DESKTOP+=( "plasma" "Simple By Default" ) - update | grep -q Sway && _DESKTOP+=( "sway" "Tiling Wayland Compositor" ) - update | grep -q Xfce && _DESKTOP+=( "xfce" "Leightweight Desktop" ) + update | rg -q 'Gnome' && _DESKTOP+=( "gnome" "Simple Beautiful Elegant" ) + update | rg -q 'KDE' && _DESKTOP+=( "plasma" "Simple By Default" ) + update | rg -q 'Sway' && _DESKTOP+=( "sway" "Tiling Wayland Compositor" ) + update | rg -q 'Xfce' && _DESKTOP+=( "xfce" "Leightweight Desktop" ) } _check_manage() { _MANAGE=() - update | grep -q full && _MANAGE+=( "FULL" "Switch To Full Arch Linux System" ) - update | grep -q 'latest archboot' && _MANAGE+=( "UPDATE" "Update Archboot Environment" ) - update | grep -q image && _MANAGE+=( "IMAGE" "Create Archboot Images" ) + update | rg -q 'full' && _MANAGE+=( "FULL" "Switch To Full Arch Linux System" ) + update | rg -q 'latest archboot' && _MANAGE+=( "UPDATE" "Update Archboot Environment" ) + update | rg -q 'image' && _MANAGE+=( "IMAGE" "Create Archboot Images" ) } _desktop () {