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

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-25 21:46:19 +02:00
parent 07fcc655c1
commit 669d099337
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
usr/lib/archboot/container.sh
View file

@ -112,7 +112,7 @@ _create_pacman_conf() {
echo "Server = https://pkg.archboot.com" >> "${_PACMAN_CONF}" echo "Server = https://pkg.archboot.com" >> "${_PACMAN_CONF}"
fi fi
#shellcheck disable=SC2001 #shellcheck disable=SC2001
[[ "${2}" == "use_binfmt" ]] && _PACMAN_CONF="$(echo "${_PACMAN_CONF}" | sed -e "s#^${1}##g")" [[ "${2}" == "use_binfmt" ]] && _PACMAN_CONF="$(echo "${_PACMAN_CONF}" | sd "^${1}" '')"
else else
echo "Using custom pacman.conf..." echo "Using custom pacman.conf..."
_PACMAN_CONF="$(mktemp "${1}"/pacman.conf.XXX)" _PACMAN_CONF="$(mktemp "${1}"/pacman.conf.XXX)"
@ -146,16 +146,14 @@ _ssh_keys() {
_change_pacman_conf() { _change_pacman_conf() {
# enable parallel downloads # enable parallel downloads
sed -i -e 's:^#ParallelDownloads:ParallelDownloads:g' "${1}"/etc/pacman.conf sd '^#ParallelDownloads' 'ParallelDownloads' "${1}"/etc/pacman.conf
sed -i -e 's:^#Color:Color:g' "${1}"/etc/pacman.conf sd '^#Color' 'Color' "${1}"/etc/pacman.conf
} }
# umount special filesystems # umount special filesystems
_umount_special() { _umount_special() {
echo "Unmounting special filesystems in ${1}..." echo "Unmounting special filesystems in ${1}..."
umount -R "${1}/proc" umount -R "${1}"/{proc,sys,dev}
umount -R "${1}/sys"
umount -R "${1}/dev"
} }
_install_base_packages() { _install_base_packages() {
@ -239,7 +237,7 @@ _copy_archboot_defaults() {
_reproducibility() { _reproducibility() {
echo "Reproducibility changes..." echo "Reproducibility changes..."
sed -i -e '/INSTALLDATE/{n;s/.*/0/}' "${1}""${_PACMAN_LIB}"/local/*/desc sd 'INSTALLDATE' '{n;s/.*/0/}' "${1}""${_PACMAN_LIB}"/local/*/desc
rm "${1}"/var/cache/ldconfig/aux-cache rm "${1}"/var/cache/ldconfig/aux-cache
rm "${1}"/etc/ssl/certs/java/cacerts rm "${1}"/etc/ssl/certs/java/cacerts
} }