kevin/asdf
1
Fork 0
mirror of https://github.com/asdf-vm/asdf.git synced 2024-11-15 01:28:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #360 from teixeiradiego/reshim-fix

Browse Source 
Fix reshim to generate shims only for executable files and not directories.
This commit is contained in:
Trevor Brown 2018-09-19 08:16:33 -04:00 committed by GitHub
commit 266e3cffa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commands/reshim.sh
View File

@ -143,7 +143,7 @@ generate_shims_for_version() {
# because just $executable_file gives absolute path; We don't want version hardcoded in shim
local executable_path_relative_to_install_path
executable_path_relative_to_install_path="$bin_path"/$(basename "$executable_file")
if [ -x "$executable_file" ]; then
if [[ (-f "$executable_file") && (-x "$executable_file") ]]; then
write_shim_script "$plugin_name" "$version" "$executable_path_relative_to_install_path"
fi
done

1
test/fixtures/dummy_plugin/bin/install vendored
View File

@ -10,3 +10,4 @@ cat <<EOF > "$ASDF_INSTALL_PATH/bin/dummy"
echo This is Dummy ${ASDF_INSTALL_VERSION}! \$2 \$1
EOF
chmod +x "$ASDF_INSTALL_PATH/bin/dummy"
mkdir -p "$ASDF_INSTALL_PATH/bin/subdir"

9
test/install_command.bats
View File

@ -72,6 +72,15 @@ teardown() {
[ "$lines_count" -eq "1" ]
}
@test "install_command should not generate shim for subdir" {
cd $PROJECT_DIR
echo 'dummy 1.0' > $PROJECT_DIR/.tool-versions
run install_command
[ "$status" -eq 0 ]
[ -f "$ASDF_DIR/shims/dummy" ]
[ ! -f "$ASDF_DIR/shims/subdir" ]
}
@test "install_command generated shim should pass all arguments to executable" {
# asdf lib needed to run generated shims

21
test/reshim_command.bats
View File

@ -67,3 +67,24 @@ teardown() {
[ "$status" -eq 0 ]
[ "1" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
}
@test "reshim should create shims only for files and not folders" {
cd $PROJECT_DIR
run install_command dummy 1.0
run install_command dummy 1.1
[ "$status" -eq 0 ]
[ -f "$ASDF_DIR/shims/dummy" ]
[ ! -f "$ASDF_DIR/shims/subdir" ]
run rm $ASDF_DIR/shims/*
[ "$status" -eq 0 ]
[ "0" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "0" -eq "$(ls $ASDF_DIR/shims/subdir* | wc -l)" ]
run reshim_command dummy
[ "$status" -eq 0 ]
[ "1" -eq "$(ls $ASDF_DIR/shims/dummy* | wc -l)" ]
[ "0" -eq "$(ls $ASDF_DIR/shims/subdir* | wc -l)" ]
}