Skip to content

Commit

Permalink
fix: Force the shim to be created at the root of dotnet folder
Browse files Browse the repository at this point in the history
  • Loading branch information
hensou committed Apr 25, 2022
1 parent 6e2cd82 commit 65b5b7a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
12 changes: 1 addition & 11 deletions bin/download
Expand Up @@ -11,15 +11,5 @@ source "${plugin_dir}/lib/utils.bash"
DOWNLOADER=$(which curl)
mkdir -p "$ASDF_DOWNLOAD_PATH"

# TODO: Adapt this to proper extension and adapt extracting strategy.
#release_file="$ASDF_DOWNLOAD_PATH/$TOOL_NAME-$ASDF_INSTALL_VERSION.tar.gz"

# Download tar.gz file to the download directory
#download_release "$ASDF_INSTALL_VERSION" "$release_file"
# Download dotnet install file to the download directory
download_installer "$DOWNLOADER"

# Extract contents of tar.gz file into the download directory
#tar -xzf "$release_file" -C "$ASDF_DOWNLOAD_PATH" --strip-components=1 || fail "Could not extract $release_file"

# Remove the tar.gz file since we don't need to keep it
#rm "$release_file"
2 changes: 2 additions & 0 deletions bin/list-bin-paths
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
echo . shared
3 changes: 0 additions & 3 deletions lib/utils.bash
Expand Up @@ -91,11 +91,8 @@ install_version() {
(
mkdir -p "$install_path"

#TODO: remove this line as it is not necessary
#cp -r "$ASDF_DOWNLOAD_PATH"/* "$install_path"
"$ASDF_DOWNLOAD_PATH/dotnet-install.sh" --install-dir "$ASDF_INSTALL_PATH" --channel Current --version "$ASDF_INSTALL_VERSION" --no-path

# TODO: Asert dotnet executable exists.
local tool_cmd
tool_cmd="$(echo "$TOOL_TEST" | cut -d' ' -f1)"
test -x "$install_path/$tool_cmd" || fail "Expected $install_path/bin/$tool_cmd to be executable."
Expand Down

0 comments on commit 65b5b7a

Please sign in to comment.