From abc19ee1d055eef38524830fab4e72ebf5db3c12 Mon Sep 17 00:00:00 2001 From: Scott Busche Date: Thu, 8 Sep 2016 11:40:31 -0500 Subject: [PATCH] Revert "Fix creating symlinks in cygwin (#302)" (#468) This reverts commit e3a4d4691845ecbc658fb420d7e3fc60a2491396. This fixes issue #467. Cygwin can be configured to do what this commit did by setting the following `export CYGWIN=winsymlinks:native` --- src/main/bash/sdkman-path-helpers.sh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/bash/sdkman-path-helpers.sh b/src/main/bash/sdkman-path-helpers.sh index 9efb7c66..e0b5d017 100644 --- a/src/main/bash/sdkman-path-helpers.sh +++ b/src/main/bash/sdkman-path-helpers.sh @@ -84,17 +84,5 @@ function __sdkman_link_candidate_version { if [[ -h "${SDKMAN_CANDIDATES_DIR}/${candidate}/current" || -d "${SDKMAN_CANDIDATES_DIR}/${candidate}/current" ]]; then rm -f "${SDKMAN_CANDIDATES_DIR}/${candidate}/current" fi - - function cygwin_ln(){ - mapfile -t ph < <(cygpath -aw "$@") - [ -d "$2" ] && d=/d || d= - cmd /c mklink $d "${ph[@]}" - } - - # cygwin doesn't handle symlinks properly, fall back to a proxy mklink - if [[ "$OSTYPE" == "cygwin" ]]; then - cygwin_ln "${SDKMAN_CANDIDATES_DIR}/${candidate}/current" "${SDKMAN_CANDIDATES_DIR}/${candidate}/${version}" - else - ln -s "${SDKMAN_CANDIDATES_DIR}/${candidate}/${version}" "${SDKMAN_CANDIDATES_DIR}/${candidate}/current" - fi + ln -s "${SDKMAN_CANDIDATES_DIR}/${candidate}/${version}" "${SDKMAN_CANDIDATES_DIR}/${candidate}/current" }