diff options
| author | B. Watson <urchlay@slackware.uk> | 2024-11-18 02:00:44 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-11-23 10:50:33 +0700 |
| commit | 64517c893be366e7ef39bf591a66708ad7395e55 (patch) | |
| tree | 5a039629df1de07601e96964bfef322c7cff45a9 | |
| parent | 4c79fb655721094fcb4bfecb543626b6d9464ae2 (diff) | |
network/rspamd: Fix PRINT_PACKAGE_NAME.
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | network/rspamd/rspamd.SlackBuild | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild index ac3b8abcf7..cc1b623c87 100644 --- a/network/rspamd/rspamd.SlackBuild +++ b/network/rspamd/rspamd.SlackBuild @@ -22,6 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20241118 bkw: Modified by SlackBuilds.org: +# - move PRINT_PACKAGE_NAME so it's before user/group check. +# - redirect output from getent to /dev/null. + # 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build. # 20241009 bkw: Modified by SlackBuilds.org, BUILD=2: @@ -43,6 +47,11 @@ if [ -z "$ARCH" ]; then esac fi +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + # 20220320 bkw: please don't make me run the script twice to see # both commands: show them both if either is missing. group_user_error() { @@ -53,13 +62,8 @@ group_user_error() { } UIDGID=359 -getent group $PRGNAM || group_user_error -getent passwd $PRGNAM || group_user_error - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi +getent group $PRGNAM &>/dev/null || group_user_error +getent passwd $PRGNAM &>/dev/null || group_user_error TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM |