diff --git a/usr/bin/archboot-fw-check.sh b/usr/bin/archboot-fw-check.sh index 5abe380e2..fad4e73bf 100755 --- a/usr/bin/archboot-fw-check.sh +++ b/usr/bin/archboot-fw-check.sh @@ -20,7 +20,7 @@ done fd -u -t f 'zst' "${_FIRMWARE}" >firmware.txt cp firmware.txt firmware.orig.txt while read -r i; do - sed -i -e "s#${i}##g" firmware.txt + sd "${i}" '' firmware.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 if [[ -s fw-error.txt ]]; then diff --git a/usr/bin/archboot-launcher.sh b/usr/bin/archboot-launcher.sh index c920484c5..04a1c5d1b 100755 --- a/usr/bin/archboot-launcher.sh +++ b/usr/bin/archboot-launcher.sh @@ -28,7 +28,7 @@ _desktop () { "chromium" "Browser From Google" \ "firefox" "Browser From Mozilla" 2>${_ANSWER} || return 1 _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 clear update -${_EXIT} || exit 1 diff --git a/usr/bin/archboot-localize.sh b/usr/bin/archboot-localize.sh index 5b7907cef..be0461ec1 100755 --- a/usr/bin/archboot-localize.sh +++ b/usr/bin/archboot-localize.sh @@ -66,8 +66,8 @@ _localize_task() { echo "LANG=${_LOCALE}.UTF-8" > /.localize echo LC_COLLATE=C >> /etc/locale.conf localectl set-locale "${_LOCALE}.UTF-8" &>"${_NO_LOG}" - sed -i -e "s:^[a-z]:#&:g" /etc/locale.gen - sed -i -e "s:^#${_LOCALE}.UTF-8:${_LOCALE}.UTF-8:g" /etc/locale.gen + sd '(^[a-z])' '#$1' /etc/locale.gen + sd "^#${_LOCALE}.UTF-8" "${_LOCALE}.UTF-8" /etc/locale.gen locale-gen &>"${_NO_LOG}" # Terminus font size detection if rg -q '^FONT=.*32' /etc/vconsole.conf; then diff --git a/usr/bin/archboot-network.sh b/usr/bin/archboot-network.sh index 0cf3275ef..37f4aa6d7 100755 --- a/usr/bin/archboot-network.sh +++ b/usr/bin/archboot-network.sh @@ -82,7 +82,7 @@ _wireless() { fi # replace # with spaces again #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 #shellcheck disable=SC2143 if ! [[ "$(iwctl station "${_INTERFACE}" get-networks | rg -q "${_WLAN_SSID}.*open")" ]] \ diff --git a/usr/bin/archboot-not-installed.sh b/usr/bin/archboot-not-installed.sh index 93bc579e1..b4475e32d 100755 --- a/usr/bin/archboot-not-installed.sh +++ b/usr/bin/archboot-not-installed.sh @@ -10,7 +10,7 @@ rm -r /usr/share/{licenses,locale} /usr/lib/{systemd,tmpfiles.d} pacman -Sy #shellcheck disable=SC2013 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 if pacman -Sdd ${i} --noconfirm >>log.txt; then echo "${i}" >> not-installed.orig.txt diff --git a/usr/bin/archboot-pacsetup.sh b/usr/bin/archboot-pacsetup.sh index 271191634..f492eb5da 100755 --- a/usr/bin/archboot-pacsetup.sh +++ b/usr/bin/archboot-pacsetup.sh @@ -49,7 +49,7 @@ _select_mirror() { fi echo "Using mirror: ${_SYNC_URL}" >"${_LOG}" # comment already existing entries - sed -i -e 's|^Server|#Server|g' "${_PACMAN_MIRROR}" + sd '^Server' '#Server' "${_PACMAN_MIRROR}" #shellcheck disable=SC2027,SC2086 echo "Server = "${_SYNC_URL}"" >> "${_PACMAN_MIRROR}" if ! pacman -Sy &>${_LOG}; then @@ -64,9 +64,7 @@ _enable_testing() { _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 if [[ -n "${_DOTESTING}" ]]; then - sed -i -e '/^#\[core-testing\]/ { n ; s/^#// }' /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 + sd '^#(\[[c,e].*-testing\]\n)#' '$1' "${1}/etc/pacman.conf" fi else _DOTESTING=1 diff --git a/usr/bin/archboot-update.sh b/usr/bin/archboot-update.sh index f4bf443b3..0ccdc5fee 100755 --- a/usr/bin/archboot-update.sh +++ b/usr/bin/archboot-update.sh @@ -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']" fi # 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 \ /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 \ /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml 2>"${_NO_LOG}" if [[ -n "${_L_XFCE}" ]]; then