erik/sdkman-for-fish
erik/sdkman-for-fish
1
0
Fork 0
mirror of https://github.com/ethauvin/sdkman-for-fish.git synced 2025-04-25 05:17:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Final macOS incompatibility fix.

Browse source 
Closes issue #29.
This commit is contained in:
Raphael Reitzig 2019-11-06 20:52:07 +01:00
parent 7e9d8a7031
commit ac99d1464c
6 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.editorconfig
View file

@ -8,5 +8,8 @@ indent_size = 4
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
[*.{yaml,yml}]
indent_size = 2
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false

5
.travis.yml
View file

@ -31,7 +31,6 @@ matrix:
- fish # --> latest, i.e. >=3.0.2 - fish # --> latest, i.e. >=3.0.2
update: true # TODO: build should be green without, but isn't update: true # TODO: build should be green without, but isn't
sudo: required
before_install: before_install:
- curl -s "https://get.sdkman.io" | bash - curl -s "https://get.sdkman.io" | bash
- bash test/prepare_tests.sh - bash test/prepare_tests.sh
@ -47,5 +46,5 @@ script:
- ruby test/completion.rb - ruby test/completion.rb
- fish test/wrapper.fish - fish test/wrapper.fish
- fish test/reinitialize.fish - fish test/reinitialize.fish
- bash -c "source \"${HOME}/.sdkman/bin/sdkman-init.sh\" && sdk install crash 1.3.0 && sdk uninstall crash 1.3.0" && fish test/10_zombies_new.fish - bash test/install_uninstall_candidate.sh > /dev/null && fish test/10_zombies_new.fish
- bash -c "rm -rf \"${HOME}/.sdkman\" && sed -i'.bak' -e 's/^.*\(sdkman\|SDKMAN\).*$//g' \"${HOME}/.bashrc\" && echo 'SDKMAN uninstalled'" && fish -c "echo 'y' | sdk" && fish -c "sdk version" - bash test/remove_sdkman.sh > /dev/null && fish -c "echo 'y' | sdk" > /dev/null && fish -c "sdk version"

2
completions/sdk.fish
View file

@ -39,7 +39,7 @@ function __fish_sdkman_specifying_candidate
set cmd (commandline -opc) set cmd (commandline -opc)
if [ (count $cmd) -eq 3 ] # currently, sdk does not support multiple versions if [ (count $cmd) -eq 3 ] # currently, sdk does not support multiple versions
if contains $cmd[2] $argv ] if contains $cmd[2] $argv
return 0 return 0
end end
end end

6
conf.d/sdk.fish
View file

@ -22,8 +22,8 @@ if begin not test -f "$__fish_sdkman_noexport_init";
or env test "$__fish_sdkman_init" -nt "$__fish_sdkman_noexport_init" or env test "$__fish_sdkman_init" -nt "$__fish_sdkman_noexport_init"
end end
mkdir -p (dirname $__fish_sdkman_noexport_init) mkdir -p (dirname $__fish_sdkman_noexport_init)
sed -e 's/^\(\s*\).*\(export\|to_path\).*$/\1:/g' "$__fish_sdkman_init" \ sed -E -e 's/^(\s*).*(export|to_path).*$/\1:/g' "$__fish_sdkman_init" \
> $__fish_sdkman_noexport_init > "$__fish_sdkman_noexport_init"
end end
# Runs the given command in bash, capturing some side effects # Runs the given command in bash, capturing some side effects
@ -66,7 +66,7 @@ function __fish_sdkman_run_in_bash
if test -n value if test -n value
set -gx $var $value set -gx $var $value
# Note: This makes SDKMAN_OFFLINE_MODE an environment variable. # Note: This makes SDKMAN_OFFLINE_MODE an environment variable.
# That gives it the behavariour we _want_! # That gives it the behaviour we _want_!
end end
end end
end end

5
test/install_uninstall_candidate.sh Normal file
View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
source "${HOME}/.sdkman/bin/sdkman-init.sh" \
&& sdk install crash 1.3.0 \
&& sdk uninstall crash 1.3.0

5
test/remove_sdkman.sh Normal file
View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
rm -rf "${HOME}/.sdkman" \
&& sed -i'.bak' -E -e 's/^.*(sdkman|SDKMAN).*$//g' "${HOME}/.bashrc" \
&& echo 'SDKMAN! uninstalled'