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 and sed with sd

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-28 14:50:32 +02:00
parent 7b6a5ffebe
commit 0ec84aec6a
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/lib/archboot/installer/autoconfiguration.sh
View file

@ -113,12 +113,12 @@ _auto_pacman_keyring()
_progress "47" "Enable pacman's GPG keyring files on installed system..." _progress "47" "Enable pacman's GPG keyring files on installed system..."
cp -ar /etc/pacman.d/gnupg "${_DESTDIR}"/etc/pacman.d &>"${_NO_LOG}" cp -ar /etc/pacman.d/gnupg "${_DESTDIR}"/etc/pacman.d &>"${_NO_LOG}"
read -r -t 2 read -r -t 2
fi # fi
} }
_auto_testing() _auto_testing()
{ {
if rg -q "^\[core-testing" /etc/pacman.conf; then if rg -q '^\[core-testing' /etc/pacman.conf; then
_progress "53" "Enable [testing] repository on installed system..." _progress "53" "Enable [testing] repository on installed system..."
sd '^#(\[[c,e].*-testing\]\n)#' '$1' "${_DESTDIR}"/etc/pacman.conf sd '^#(\[[c,e].*-testing\]\n)#' '$1' "${_DESTDIR}"/etc/pacman.conf
read -r -t 2 read -r -t 2
@ -130,7 +130,7 @@ _auto_pacman_mirror() {
# add installer-selected mirror to the top of the mirrorlist # add installer-selected mirror to the top of the mirrorlist
if rg -q '^Server' /etc/pacman.d/mirrorlist; then if rg -q '^Server' /etc/pacman.d/mirrorlist; then
_progress "62" "Enable pacman mirror on installed system..." _progress "62" "Enable pacman mirror on installed system..."
_SYNC_URL=$(rg '^Server.* (.*)' -r '$1') _SYNC_URL=$(rg '^Server.* (.*)' -r '$1' /etc/pacman.d/mirrorlist)
#shellcheck disable=SC2027,SC2086 #shellcheck disable=SC2027,SC2086
cat << EOF > /tmp/inst-mirrorlist cat << EOF > /tmp/inst-mirrorlist
# Mirror used during installation # Mirror used during installation

4
usr/lib/archboot/installer/common.sh
View file

@ -78,9 +78,7 @@ _chroot_mount()
_chroot_umount() _chroot_umount()
{ {
if rg -qw '^archboot' /etc/hostname; then if rg -qw '^archboot' /etc/hostname; then
umount -R "${_DESTDIR}/proc" umount -R "${_DESTDIR}"/{proc,sys,dev}
umount -R "${_DESTDIR}/sys"
umount -R "${_DESTDIR}/dev"
fi fi
} }