busybox's find doesn't understand '-empty', so when running these postinst scripts on a system without GNU coreutils, they will display a nice help text instead.
Replace the find call with a test that tries to expand the same pattern that is used afterwards, so cat doesn't run with a non-matching pattern. Signed-off-by: Roland Hieber <[email protected]> --- v1 -> v2: - use $(...) instead of `...` command expansion, https://github.com/koalaman/shellcheck/wiki/SC2006 --- rules/busybox.postinst | 3 +-- rules/dnsmasq.postinst | 3 +-- rules/inetutils.postinst | 3 +-- rules/portmap.postinst | 3 +-- rules/pureftpd.postinst | 3 +-- rules/rsync.postinst | 3 +-- rules/urshd.postinst | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/rules/busybox.postinst b/rules/busybox.postinst index 6f564791d0c8..441d6ef02e43 100644 --- a/rules/busybox.postinst +++ b/rules/busybox.postinst @@ -1,8 +1,7 @@ #!/bin/sh # generate inetd.conf -if [ -d $DESTDIR/etc/inetd.conf.d ] && - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then +if [ "$(echo $DESTDIR/etc/inetd.conf.d/*)" != "$DESTDIR/etc/inetd.conf.d/*" ]; then cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf fi diff --git a/rules/dnsmasq.postinst b/rules/dnsmasq.postinst index 6f564791d0c8..441d6ef02e43 100644 --- a/rules/dnsmasq.postinst +++ b/rules/dnsmasq.postinst @@ -1,8 +1,7 @@ #!/bin/sh # generate inetd.conf -if [ -d $DESTDIR/etc/inetd.conf.d ] && - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then +if [ "$(echo $DESTDIR/etc/inetd.conf.d/*)" != "$DESTDIR/etc/inetd.conf.d/*" ]; then cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf fi diff --git a/rules/inetutils.postinst b/rules/inetutils.postinst index 6f564791d0c8..441d6ef02e43 100644 --- a/rules/inetutils.postinst +++ b/rules/inetutils.postinst @@ -1,8 +1,7 @@ #!/bin/sh # generate inetd.conf -if [ -d $DESTDIR/etc/inetd.conf.d ] && - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then +if [ "$(echo $DESTDIR/etc/inetd.conf.d/*)" != "$DESTDIR/etc/inetd.conf.d/*" ]; then cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf fi diff --git a/rules/portmap.postinst b/rules/portmap.postinst index 6f564791d0c8..441d6ef02e43 100644 --- a/rules/portmap.postinst +++ b/rules/portmap.postinst @@ -1,8 +1,7 @@ #!/bin/sh # generate inetd.conf -if [ -d $DESTDIR/etc/inetd.conf.d ] && - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then +if [ "$(echo $DESTDIR/etc/inetd.conf.d/*)" != "$DESTDIR/etc/inetd.conf.d/*" ]; then cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf fi diff --git a/rules/pureftpd.postinst b/rules/pureftpd.postinst index 6f564791d0c8..441d6ef02e43 100644 --- a/rules/pureftpd.postinst +++ b/rules/pureftpd.postinst @@ -1,8 +1,7 @@ #!/bin/sh # generate inetd.conf -if [ -d $DESTDIR/etc/inetd.conf.d ] && - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then +if [ "$(echo $DESTDIR/etc/inetd.conf.d/*)" != "$DESTDIR/etc/inetd.conf.d/*" ]; then cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf fi diff --git a/rules/rsync.postinst b/rules/rsync.postinst index 6f564791d0c8..441d6ef02e43 100644 --- a/rules/rsync.postinst +++ b/rules/rsync.postinst @@ -1,8 +1,7 @@ #!/bin/sh # generate inetd.conf -if [ -d $DESTDIR/etc/inetd.conf.d ] && - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then +if [ "$(echo $DESTDIR/etc/inetd.conf.d/*)" != "$DESTDIR/etc/inetd.conf.d/*" ]; then cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf fi diff --git a/rules/urshd.postinst b/rules/urshd.postinst index 6f564791d0c8..441d6ef02e43 100644 --- a/rules/urshd.postinst +++ b/rules/urshd.postinst @@ -1,8 +1,7 @@ #!/bin/sh # generate inetd.conf -if [ -d $DESTDIR/etc/inetd.conf.d ] && - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then +if [ "$(echo $DESTDIR/etc/inetd.conf.d/*)" != "$DESTDIR/etc/inetd.conf.d/*" ]; then cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf fi -- 2.20.1 _______________________________________________ ptxdist mailing list [email protected]
