root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

replace sed with sd

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-27 07:36:04 +02:00
parent d5b0c738b5
commit 453dc0c236
7 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ done
fd -u -t f 'zst' "${_FIRMWARE}" >firmware.txt fd -u -t f 'zst' "${_FIRMWARE}" >firmware.txt
cp firmware.txt firmware.orig.txt cp firmware.txt firmware.orig.txt
while read -r i; do while read -r i; do
sed -i -e "s#${i}##g" firmware.txt sd "${i}" '' firmware.txt
done < modules.txt done < modules.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 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 if [[ -s fw-error.txt ]]; then

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

@ -28,7 +28,7 @@ _desktop () {
"chromium" "Browser From Google" \ "chromium" "Browser From Google" \
"firefox" "Browser From Mozilla" 2>${_ANSWER} || return 1 "firefox" "Browser From Mozilla" 2>${_ANSWER} || return 1
_BROWSER="$(cat ${_ANSWER})" _BROWSER="$(cat ${_ANSWER})"
sed -i -e "s#STANDARD_BROWSER=.*#STANDARD_BROWSER=${_BROWSER}#g" /etc/archboot/defaults sd "STANDARD_BROWSER=.*" "STANDARD_BROWSER=${_BROWSER}" /etc/archboot/defaults
source /etc/locale.conf source /etc/locale.conf
clear clear
update -${_EXIT} || exit 1 update -${_EXIT} || exit 1

4
usr/bin/archboot-localize.sh
View file

@ -66,8 +66,8 @@ _localize_task() {
echo "LANG=${_LOCALE}.UTF-8" > /.localize echo "LANG=${_LOCALE}.UTF-8" > /.localize
echo LC_COLLATE=C >> /etc/locale.conf echo LC_COLLATE=C >> /etc/locale.conf
localectl set-locale "${_LOCALE}.UTF-8" &>"${_NO_LOG}" localectl set-locale "${_LOCALE}.UTF-8" &>"${_NO_LOG}"
sed -i -e "s:^[a-z]:#&:g" /etc/locale.gen sd '(^[a-z])' '#$1' /etc/locale.gen
sed -i -e "s:^#${_LOCALE}.UTF-8:${_LOCALE}.UTF-8:g" /etc/locale.gen sd "^#${_LOCALE}.UTF-8" "${_LOCALE}.UTF-8" /etc/locale.gen
locale-gen &>"${_NO_LOG}" locale-gen &>"${_NO_LOG}"
# Terminus font size detection # Terminus font size detection
if rg -q '^FONT=.*32' /etc/vconsole.conf; then if rg -q '^FONT=.*32' /etc/vconsole.conf; then

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

@ -82,7 +82,7 @@ _wireless() {
fi fi
# replace # with spaces again # replace # with spaces again
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
_WLAN_SSID="$(echo ${_WLAN_SSID} | sed -e 's|\+|\ |g')" _WLAN_SSID="$(echo ${_WLAN_SSID} | sd '\+' ' ')"
# expect hidden network has a WLAN_KEY # expect hidden network has a WLAN_KEY
#shellcheck disable=SC2143 #shellcheck disable=SC2143
if ! [[ "$(iwctl station "${_INTERFACE}" get-networks | rg -q "${_WLAN_SSID}.*open")" ]] \ if ! [[ "$(iwctl station "${_INTERFACE}" get-networks | rg -q "${_WLAN_SSID}.*open")" ]] \

2
usr/bin/archboot-not-installed.sh
View file

@ -10,7 +10,7 @@ rm -r /usr/share/{licenses,locale} /usr/lib/{systemd,tmpfiles.d}
pacman -Sy pacman -Sy
#shellcheck disable=SC2013 #shellcheck disable=SC2013
for i in $(pacman -Q | cut -d ' ' -f1); do for i in $(pacman -Q | cut -d ' ' -f1); do
rm -r "${_PACMAN_LIB}"/local/$(pacman -Q ${i} | cut -d ' ' -f1,2 | sed -s 's# #-#g') rm -r "${_PACMAN_LIB}"/local/$(pacman -Q ${i} | sd ' ' '-')
#shellcheck disable=SC2086 #shellcheck disable=SC2086
if pacman -Sdd ${i} --noconfirm >>log.txt; then if pacman -Sdd ${i} --noconfirm >>log.txt; then
echo "${i}" >> not-installed.orig.txt echo "${i}" >> not-installed.orig.txt

6
usr/bin/archboot-pacsetup.sh
View file

@ -49,7 +49,7 @@ _select_mirror() {
fi fi
echo "Using mirror: ${_SYNC_URL}" >"${_LOG}" echo "Using mirror: ${_SYNC_URL}" >"${_LOG}"
# comment already existing entries # comment already existing entries
sed -i -e 's|^Server|#Server|g' "${_PACMAN_MIRROR}" sd '^Server' '#Server' "${_PACMAN_MIRROR}"
#shellcheck disable=SC2027,SC2086 #shellcheck disable=SC2027,SC2086
echo "Server = "${_SYNC_URL}"" >> "${_PACMAN_MIRROR}" echo "Server = "${_SYNC_URL}"" >> "${_PACMAN_MIRROR}"
if ! pacman -Sy &>${_LOG}; then if ! pacman -Sy &>${_LOG}; then
@ -64,9 +64,7 @@ _enable_testing() {
_DOTESTING="" _DOTESTING=""
_dialog --title " Testing Repositories " --defaultno --yesno "Do you want to enable testing repositories?\n\nOnly enable this if you need latest\navailable packages for testing purposes!" 8 50 && _DOTESTING=1 _dialog --title " Testing Repositories " --defaultno --yesno "Do you want to enable testing repositories?\n\nOnly enable this if you need latest\navailable packages for testing purposes!" 8 50 && _DOTESTING=1
if [[ -n "${_DOTESTING}" ]]; then if [[ -n "${_DOTESTING}" ]]; then
sed -i -e '/^#\[core-testing\]/ { n ; s/^#// }' /etc/pacman.conf sd '^#(\[[c,e].*-testing\]\n)#' '$1' "${1}/etc/pacman.conf"
sed -i -e '/^#\[extra-testing\]/ { n ; s/^#// }' /etc/pacman.conf
sed -i -e 's:^#\[core-testing\]:\[core-testing\]:g' -e 's:^#\[extra-testing\]:\[extra-testing\]:g' /etc/pacman.conf
fi fi
else else
_DOTESTING=1 _DOTESTING=1

4
usr/bin/archboot-update.sh
View file

@ -92,10 +92,10 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
[[ "${_STANDARD_BROWSER}" == "chromium" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'chromium.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']" [[ "${_STANDARD_BROWSER}" == "chromium" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'chromium.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
fi fi
# plasma and xfce # plasma and xfce
sed -i -e "s#firefox#${_STANDARD_BROWSER}#g" /etc/xdg/xfce4/helpers.rc \ sd 'firefox' "${_STANDARD_BROWSER}" /etc/xdg/xfce4/helpers.rc \
/etc/xdg/menus/plasma-applications.menu \ /etc/xdg/menus/plasma-applications.menu \
/usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml 2>"${_NO_LOG}" /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml 2>"${_NO_LOG}"
sed -i -e "s#chromium#${_STANDARD_BROWSER}#g" /etc/xdg/xfce4/helpers.rc \ sd 'chromium' "${_STANDARD_BROWSER}" /etc/xdg/xfce4/helpers.rc \
/etc/xdg/menus/plasma-applications.menu \ /etc/xdg/menus/plasma-applications.menu \
/usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml 2>"${_NO_LOG}" /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml 2>"${_NO_LOG}"
if [[ -n "${_L_XFCE}" ]]; then if [[ -n "${_L_XFCE}" ]]; then