From c84e119e6f7df41c337e9ca758aad6480929ef1a Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 15 Feb 2026 15:57:16 +0000 Subject: [PATCH] pkg.sh milk-install-log: Clean up Debian filters Among other atrocities, the Debian path filter contains some horrible redundancies in an sed regular expression. Be a little less redundant about it. Signed-off-by: Jan Lindemann --- scripts/pkg.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/pkg.sh b/scripts/pkg.sh index b536ecc8..e22530ae 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -1033,13 +1033,16 @@ cmd_milk_install_log() echo $subpackages | grep -q devel || cat $in.$name-devel >> $in.$name-run ;; deb) - cat_log | grep -v "%dir" | sed "s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -ve $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/inst-root\1\/\2 \1/' > $out/$name-run.install - cat_log | grep -v "%dir" | sed "s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -e $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/inst-root\1\/\2 \1/' > $out/$name-devel.install - cat_log | grep "%dir" | sed "s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -ve $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/\1\/\2/; s%^/%%' | sort -u > $out/$name-run.dirs - cat_log | grep "%dir" | sed "s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -e $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/\1\/\2/; s%^/%%' | sort -u > $out/$name-devel.dirs - #cat_log | sed "/%config/ !d; s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -ve $filter_devel > $out/conffiles - cat_log | sed "/%config/ !d; s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -ve $filter_devel > $out/conffiles.$name-run - cat_log | sed "/%config/ !d; s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -e $filter_devel > $out/conffiles.$name-devel + filter_path() { + sed "s|%config\s*||g; s% $prefix% %; s%//*%/%g; s/.*) *//" + } + + cat_log | grep -v "%dir" | filter_path | grep -ve $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/inst-root\1\/\2 \1/' > $out/$name-run.install + cat_log | grep -v "%dir" | filter_path | grep -e $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/inst-root\1\/\2 \1/' > $out/$name-devel.install + cat_log | grep "%dir" | filter_path | grep -ve $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/\1\/\2/; s%^/%%' | sort -u > $out/$name-run.dirs + cat_log | grep "%dir" | filter_path | grep -e $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/\1\/\2/; s%^/%%' | sort -u > $out/$name-devel.dirs + cat_log | grep "%config" | filter_path | grep -ve $filter_devel > $out/conffiles.$name-run + cat_log | grep "%config" | filter_path | grep -e $filter_devel > $out/conffiles.$name-devel for p in run devel; do postinst=$out/$name-$p.postinst