Use basic regular expressions for sed portability

This commit is contained in:
Chris Bandy 2016-02-09 13:30:39 -06:00
parent 0120438b94
commit 1d3093798e
2 changed files with 3 additions and 12 deletions

View File

@ -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() {

View File

@ -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