Module Name: src
Committed By: uwe
Date: Thu Oct 10 22:30:01 UTC 2024
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
postinstall: get rid of exclude -t
exclude_libs() no longer uses it, so revert exclude() to what it was
before the -t was introduced.
It can probably be further improved, but I'm not sure why it needs
eval and why it wants to anchor at the beginning of the line only
(something to do with e.g. blocklist vs. blocklistd), and I don't have
time to investigate this properly at the moment.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.66 src/usr.sbin/postinstall/postinstall.in:1.67
--- src/usr.sbin/postinstall/postinstall.in:1.66 Thu Oct 10 22:14:34 2024
+++ src/usr.sbin/postinstall/postinstall.in Thu Oct 10 22:30:01 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.66 2024/10/10 22:14:34 uwe Exp $
+# $NetBSD: postinstall.in,v 1.67 2024/10/10 22:30:01 uwe Exp $
#
# Copyright (c) 2002-2022 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -572,21 +572,10 @@ obsolete_libs()
exclude()
{
- local dollar
- case "$1" in
- -t)
- dollar='$'
- shift
- ;;
- *)
- dollar=
- ;;
- esac
if [ -z "$*" ]; then
cat
else
- eval ${GREP} -v -E "'(^$(echo $* | \
- ${SED} -e s/\\./\\\\./g -e 's/ /'${dollar}'|^/'g)${dollar})'"
+ eval ${GREP} -v -E "'(^$(echo $* | sed -e 's/ /|^/'g))'"
fi
}
