Commit 30648866 authored by Sam Ruby's avatar Sam Ruby Committed by Sam Stephenson
Browse files

Address some feedback from Jeremy 

* Decrease likelihood of cache collisions
* Avoid file:// urls (and therefore the need to escape)
parent 394d8aaa

bin/ruby-build

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ fetch_git() { 
  if type git &>/dev/null; then

    if [ -n "$RUBY_BUILD_CACHE_PATH" ]; then

      pushd "$RUBY_BUILD_CACHE_PATH" >&4

      local clone_name=$(echo $git_url | sed "s/[^a-z0-9.]/_/g; s/__*/_/g")

      local clone_name=$(echo $git_url | sed "s/[^A-Za-z0-9.-]/_/g; s/__*/_/g")

      if [ -e "${clone_name}" ]; then

        { cd "${clone_name}"

          git fetch --force "$git_url" "+${git_ref}:${git_ref}"
@@ -302,7 +302,7 @@ fetch_git() { 
      else

        git clone --bare --branch "$git_ref" "$git_url" "${clone_name}" >&4 2>&1

      fi

      git_url="file://$RUBY_BUILD_CACHE_PATH/${clone_name}"

      git_url="$RUBY_BUILD_CACHE_PATH/${clone_name}"

      popd >&4

    fi