diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-02-18 18:30:18 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-02-18 18:30:18 +0300 |
| commit | c66d51f4f57c425bfa2fa152bd4895ed56915ceb (patch) | |
| tree | 0214fe81f65323a7eda762306bf443bbe0a4e6b7 /scripts/rabbitmq-env | |
| parent | 4152ecbc7a7a4d0223a4f51f542149da04f37692 (diff) | |
| parent | 01e039f4dd2b6d78d9d67f7472bc06394f320fc3 (diff) | |
| download | rabbitmq-server-git-c66d51f4f57c425bfa2fa152bd4895ed56915ceb.tar.gz | |
Merge branch 'stable' into rabbitmq-server-248
Diffstat (limited to 'scripts/rabbitmq-env')
| -rw-r--r-- | scripts/rabbitmq-env | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 4c1d0c9da2..dffed035ea 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() { |