From 32fecdd9ccb8cf56c7f41be326e7776d46fd4fa9 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 5 Jan 2024 13:25:24 +0100 Subject: [PATCH] Improve sed regex to cover all cases that exists at once. Current solution was broken in Noble --- lib/functions/artifacts/artifact-armbian-base-files.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/functions/artifacts/artifact-armbian-base-files.sh b/lib/functions/artifacts/artifact-armbian-base-files.sh index a7876e9454..39004d6a9c 100644 --- a/lib/functions/artifacts/artifact-armbian-base-files.sh +++ b/lib/functions/artifacts/artifact-armbian-base-files.sh @@ -141,8 +141,9 @@ function compile_armbian-base-files() { sed -i '/\/etc\/dpkg\/origins\/debian/a \/etc\/dpkg\/origins\/armbian' "${destination}"/DEBIAN/conffiles # Fix symlinking in postinst for Debian and Ubuntu. They have to point towards Armbian, Armbian parent is Debian or Ubuntu -> Debian - sed -i "s|ln -sf ubuntu /etc/dpkg/origins/default|ln -sf armbian /etc/dpkg/origins/default|g" "${destination}"/DEBIAN/postinst - sed -i "s|ln -sf debian \"\$DPKG_ROOT/etc/dpkg/origins/default\"|ln -sf armbian \"\$DPKG_ROOT/etc/dpkg/origins/default\"|g" "${destination}"/DEBIAN/postinst + sed -i -E -e "s/\origins\/ubuntu|debian/origins\/armbian/g" "${destination}"/DEBIAN/postinst + sed -i -E -e "s/ln -sf ubuntu|debian/ln -sf armbian/g" "${destination}"/DEBIAN/postinst + # Create preinst file if not exists (Debian) if [[ ! -e "${destination}"/DEBIAN/preinst ]]; then cat <<- EOD >> "${destination}"/DEBIAN/preinst