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-26 20:26:51 +02:00
parent 081367c824
commit e6c0504564
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-fw-check.sh
View file

@ -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

2
usr/bin/archboot-hwsim.sh
View file

@ -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

14
usr/bin/archboot-launcher.sh
View file

@ -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 () {