diff options
author | fhajny <fhajny> | 2015-11-20 12:26:21 +0000 |
---|---|---|
committer | fhajny <fhajny> | 2015-11-20 12:26:21 +0000 |
commit | df49f4741d460f87ec2c6673195c157025563c8e (patch) | |
tree | f81a8de259921858b06551ea846f38c15cce8dcd /net/rabbitmq/patches | |
parent | e9fdcad497659a0e331a37455d7549d4f9e7d7d6 (diff) | |
download | pkgsrc-df49f4741d460f87ec2c6673195c157025563c8e.tar.gz |
Make sure scripts use Bash, fixes the plugins script.
Clean up and work around the silly coreutils (readlink) dependency.
Bump PKGREVISION.
Diffstat (limited to 'net/rabbitmq/patches')
-rw-r--r-- | net/rabbitmq/patches/patch-scripts_rabbitmq-env | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/net/rabbitmq/patches/patch-scripts_rabbitmq-env b/net/rabbitmq/patches/patch-scripts_rabbitmq-env new file mode 100644 index 00000000000..d818498e11d --- /dev/null +++ b/net/rabbitmq/patches/patch-scripts_rabbitmq-env @@ -0,0 +1,37 @@ +$NetBSD: patch-scripts_rabbitmq-env,v 1.1 2015/11/20 12:26:21 fhajny Exp $ + +Remove cumbersome symlink handling, we know where stuff is. + +--- scripts/rabbitmq-env.orig 2015-10-07 12:45:15.000000000 +0000 ++++ scripts/rabbitmq-env +@@ -15,29 +15,7 @@ + ## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. + ## + +-# We set +e here since since our test for "readlink -f" below needs to +-# be able to fail. +-set +e +-# Determine where this script is really located (if this script is +-# invoked from another script, this is the location of the caller) +-SCRIPT_PATH="$0" +-while [ -h "$SCRIPT_PATH" ] ; do +- # Determine if readlink -f is supported at all. TODO clean this up. +- FULL_PATH=`readlink -f $SCRIPT_PATH 2>/dev/null` +- if [ "$?" != "0" ]; then +- REL_PATH=`readlink $SCRIPT_PATH` +- if expr "$REL_PATH" : '/.*' > /dev/null; then +- SCRIPT_PATH="$REL_PATH" +- else +- SCRIPT_PATH="`dirname "$SCRIPT_PATH"`/$REL_PATH" +- fi +- else +- SCRIPT_PATH=$FULL_PATH +- fi +-done +-set -e +- +-SCRIPT_DIR=`dirname $SCRIPT_PATH` ++SCRIPT_DIR="@RABBITMQ_HOME@/sbin" + RABBITMQ_HOME="${SCRIPT_DIR}/.." + + ## Set defaults |