diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-02-15 20:53:04 -0800 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-02-15 20:53:04 -0800 |
| commit | 42598d54d321ee0d2d1785e5f4f36f554131fcf8 (patch) | |
| tree | c9d879d3df3f32603b8a22f0aaa4e0590b9cddd4 | |
| parent | 897458190d41596f2aa4d513172b6e6dd66aadb9 (diff) | |
| parent | 1d3093798ed77bcadf86524d127cd97f1d9c420e (diff) | |
| download | rabbitmq-server-git-42598d54d321ee0d2d1785e5f4f36f554131fcf8.tar.gz | |
Merge branch 'posix-sed' of https://github.com/cbandy/rabbitmq-server into cbandy-posix-sed
| -rw-r--r-- | scripts/rabbitmq-env | 8 | ||||
| -rw-r--r-- | scripts/rabbitmq-script-wrapper | 7 |
2 files changed, 3 insertions, 12 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 872e5492de..2a0d48085b 100644 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -103,15 +103,11 @@ fi ##--- Set environment vars RABBITMQ_<var_name> to defaults if not set -SED_OPT="-E" -if [ $(uname -s) = "Linux" ]; then - SED_OPT="-r" -fi - rmq_normalize_path() { local path=$1 - echo "$path" | sed $SED_OPT -e 's,//+,/,g' -e 's,(.)/$,\1,' + # Remove redundant slashes and strip a trailing slash + echo "$path" | sed -e 's#/\{2,\}#/#g' -e 's#/$##' } rmq_normalize_path_var() { diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper index ed4c276e53..9623f01709 100644 --- a/scripts/rabbitmq-script-wrapper +++ b/scripts/rabbitmq-script-wrapper @@ -15,14 +15,9 @@ ## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. ## -SED_OPT="-E" -if [ $(uname -s) = "Linux" ]; then - SED_OPT="-r" -fi - for arg in "$@" ; do # Wrap each arg in single quotes and wrap single quotes in double quotes, so that they're passed through cleanly. - arg=`printf %s "$arg" | sed $SED_OPT -e "s/'/'\"'\"'/g"` + arg=`printf %s "$arg" | sed -e "s#'#'\"'\"'#g"` CMDLINE="${CMDLINE} '${arg}'" done |