mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-01-31 09:43:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use universal sed switches. OSX specifics removed.

Browse Source
This commit is contained in:
Marco Vermeulen
2013-03-25 08:16:04 +00:00
parent f7147623ea
commit 61e20520ff
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/scripts/gvm-common.sh
View File

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

2
src/main/resources/scripts/gvm-use.sh
View File

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