From 61e20520ff4587bde30efcd72471e57da116d145 Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Mon, 25 Mar 2013 08:16:04 +0000 Subject: [PATCH] Use universal sed switches. OSX specifics removed. --- src/main/resources/scripts/gvm-common.sh | 4 ++-- src/main/resources/scripts/gvm-use.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/scripts/gvm-common.sh b/src/main/resources/scripts/gvm-common.sh index c3051208..05708c09 100644 --- a/src/main/resources/scripts/gvm-common.sh +++ b/src/main/resources/scripts/gvm-common.sh @@ -85,13 +85,13 @@ function __gvmtool_build_version_csv { function __gvmtool_determine_current_version { CANDIDATE="$1" - CURRENT=$(echo $PATH | sed -E "s|.gvm/${CANDIDATE}/([^/]+)/bin|!!\1!!|1" | sed -E "s|^.*!!(.+)!!.*$|\1|g") + CURRENT=$(echo $PATH | sed -r "s|.gvm/${CANDIDATE}/([^/]+)/bin|!!\1!!|1" | sed -r "s|^.*!!(.+)!!.*$|\1|g") if [[ "${CURRENT}" == "current" ]]; then unset CURRENT fi if [[ -z ${CURRENT} ]]; then - CURRENT=$(readlink "${GVM_DIR}/${CANDIDATE}/current" | sed -e "s!${GVM_DIR}/${CANDIDATE}/!!g") + CURRENT=$(readlink "${GVM_DIR}/${CANDIDATE}/current" | sed "s!${GVM_DIR}/${CANDIDATE}/!!g") fi } diff --git a/src/main/resources/scripts/gvm-use.sh b/src/main/resources/scripts/gvm-use.sh index 8cf4aead..30cd1526 100644 --- a/src/main/resources/scripts/gvm-use.sh +++ b/src/main/resources/scripts/gvm-use.sh @@ -40,7 +40,7 @@ function __gvmtool_use { export "${UPPER_CANDIDATE}_HOME"="${GVM_DIR}/${CANDIDATE}/${VERSION}" # Replace the current path for the candidate with the selected version. - export PATH=`echo $PATH | sed -E "s!${GVM_DIR}/${CANDIDATE}/([^/]+)!${GVM_DIR}/${CANDIDATE}/${VERSION}!g"` + export PATH=`echo $PATH | sed -r "s!${GVM_DIR}/${CANDIDATE}/([^/]+)!${GVM_DIR}/${CANDIDATE}/${VERSION}!g"` echo "" echo Using "${CANDIDATE}" version "${VERSION} in this shell."