Merge branch 'dev' into macos-compat

.travis.yml

@@ -30,11 +30,9 @@ matrix:
           packages:
             - fish # --> latest, i.e. >=3.0.2
           update: true # TODO: build should be green without, but isn't
-  allow_failures:
-    - env: FISH=3
 
+sudo: required
 before_install:
-  - fish --version
   - curl -s "https://get.sdkman.io" | bash
   - bash test/prepare_tests.sh
 
@@ -43,6 +41,7 @@ install:
   - cp completions/* "${HOME}"/.config/fish/completions/
   - cp conf.d/* "${HOME}"/.config/fish/conf.d/
   - cp functions/* "${HOME}"/.config/fish/functions/
+  - uname -a; fish --version
 
 script:
   - ruby test/completion.rb

README.md

@@ -5,7 +5,7 @@
 Makes command `sdk` from [SDKMAN!] available in fish.
 Also provides auto-completion and adds binaries from installed SDKs to the PATH.
 
-Tested with fish 2.7.1 and SDKMAN! 5.7.3.
+Tested with fish 2.7.1 and 3.0.2, and SDKMAN! 5.7.3.
 
 ## Install
 
@@ -24,7 +24,7 @@ with `sdk` as you would expect.
 
 ## Acknowledgements
 
- * Completion originally by [Ted Wise](https://github.com/ctwise); see his 
+ * Completion originally by [Ted Wise](https://github.com/ctwise); see his
      [blog post from 2016](http://tedwise.com/2016/02/26/using-sdkman-with-the-fish-shell).
  * Binary loading originally by [Koala Yeung](https://github.com/yookoala);
      see [his comment on sdkman/sdkman-cli#294](https://github.com/sdkman/sdkman-cli/issues/294#issuecomment-318252058).

test/wrapper.fish

@@ -40,7 +40,10 @@ for sdk_cmd in $test_commands
 
     # For nicer diffs: one entry per line, sorted
     string split ":" (cat path_bash) | sort > path_bash
-    string split " " (cat path_fish) | sort > path_fish
+    string split ":" (cat path_fish) \
+      | string split " " \
+      | sort > path_fish
+      # split by spaces for fish 2.*
 
     for out in sout status path anthome
         if [ (checksum "$out"_bash) != (checksum "$out"_fish) ]
@@ -58,4 +61,4 @@ rm {sout,status,path}_{bash,fish}
 
 echo "Ran $test_count commands with 3 checks each."
 echo "$failures/$check_count checks failed."
-exit (math $failures != 0)
+exit $failures