Merge branch 'dev'

.editorconfig

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

.travis.yml

@@ -1,12 +1,37 @@
-env:
+matrix:
-  - FISH=release-2
+  include:
-  - FISH=release-3
+    - dist: bionic
+      env: FISH=2
+      addons:
+        apt:
+          sources:
+            - sourceline: "ppa:fish-shell/release-2"
+          packages:
+            - fish
+    - dist: bionic
+      env: FISH=3
+      addons:
+        apt:
+          sources:
+            - sourceline: "ppa:fish-shell/release-3"
+          packages:
+            - fish
+    - os: osx
+      env: FISH=2
+      addons:
+        homebrew:
+          packages:
+            - 'test/Homebrew-Formula-fish-2.7.1.rb'
+          update: true # TODO: build should be green without, but isn't
+    - os: osx
+      env: FISH=3
+      addons:
+        homebrew:
+          packages:
+            - fish # --> latest, i.e. >=3.0.2
+          update: true # TODO: build should be green without, but isn't
 
-sudo: required
 before_install:
-  - sudo add-apt-repository -y ppa:fish-shell/${FISH}
-  - sudo apt-get update
-  - sudo apt-get -y install fish
   - curl -s "https://get.sdkman.io" | bash
   - bash test/prepare_tests.sh
 
@@ -21,5 +46,5 @@ script:
   - ruby test/completion.rb
   - fish test/wrapper.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
+  - fish -c "sdk install crash 1.3.0; and sdk uninstall crash 1.3.0" > /dev/null && fish test/check_for_path_zombies.fish
-  - bash -c "rm -rf ~/.sdkman &&  sed -i 's/^.*\(sdkman\|SDKMAN\).*$//g' ~/.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"

README.md

@@ -5,7 +5,11 @@
 Makes command `sdk` from [SDKMAN!] usable from fish, including auto-completion.
 Also adds binaries from installed SDKs to the PATH.
 
-Tested with fish 2.7.1 and 3.0.2, and SDKMAN! 5.7.4.
+Version 1.4.0 tested with 
+
+ - fish 2.7.1 and 3.0.2, and 
+ - SDKMAN! 5.7.4, on
+ - Ubuntu 18.04 LTS and macOS 10.13.
 
 ## Install
 

completions/sdk.fish

@@ -39,7 +39,7 @@ function __fish_sdkman_specifying_candidate
     set cmd (commandline -opc)
 
     if [ (count $cmd) -eq 3 ] # currently, sdk does not support multiple versions
-    if contains $cmd[2] $argv ]
+        if contains $cmd[2] $argv
             return 0
         end
     end
@@ -65,9 +65,9 @@ end
 
 function __fish_sdkman_candidates_with_versions
     set regexpHome (string replace -a '/' '\\/' "$HOME/")
-  find "$HOME"/.sdkman/candidates/ -name '*current*' -printf "%h\n" \
+
-  | sed -e "s/$regexpHome//" \
+    find "$HOME"/.sdkman/candidates/ -mindepth 2 -maxdepth 2 -name '*current' \
-  | cut -d '/' -f 3 \
+    | awk -F '/' '{ print $(NF-1) }' \
     | sort -u
 end
 

conf.d/sdk.fish

@@ -22,8 +22,8 @@ if  begin       not test -f "$__fish_sdkman_noexport_init";
           or    env test "$__fish_sdkman_init" -nt "$__fish_sdkman_noexport_init"
     end
     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
 
 # Runs the given command in bash, capturing some side effects
@@ -66,7 +66,7 @@ function __fish_sdkman_run_in_bash
             if test -n value
                 set -gx $var $value
                 # 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
@@ -77,7 +77,7 @@ end
 # If this is a subshell of a(n initialized) fish owned by the same user,
 # no initialization necessary.
 # Otherwise:
-if not set -q SDKMAN_DIR; or test (stat -c "%U" $SDKMAN_DIR) != (whoami)
+if not set -q SDKMAN_DIR; or test (ls -ld "$SDKMAN_DIR" | awk '{print $3}') != (whoami)
     set -e SDKMAN_DIR
     __fish_sdkman_run_in_bash "source $__fish_sdkman_init"
 end

test/Homebrew-Formula-fish-2.7.1.rb

@@ -0,0 +1,60 @@
+class HomebrewFormulaFish271 < Formula
+  desc "User-friendly command-line shell for UNIX-like operating systems"
+  homepage "https://fishshell.com"
+  url "https://github.com/fish-shell/fish-shell/releases/download/2.7.1/fish-2.7.1.tar.gz"
+  mirror "https://fishshell.com/files/2.7.1/fish-2.7.1.tar.gz"
+  sha256 "e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a"
+
+  bottle do
+    sha256 "affac16a396410a500241266dbbbd8752562c9b800d9e4f2ef8de279c6fdb6aa" => :high_sierra
+    sha256 "335538a7ea7f9613474f7321af0a1d519b61b0fc4be97a1744a7ea7bef7ff7e3" => :sierra
+    sha256 "463cfa8edc0603761f25e0ba4e49524f69a1d856263d370d1de5fb8698dd5ccf" => :el_capitan
+  end
+
+  head do
+    url "https://github.com/fish-shell/fish-shell.git", :shallow => false
+
+    depends_on "autoconf" => :build
+    depends_on "automake" => :build
+    depends_on "doxygen" => :build
+  end
+
+  depends_on "pcre2"
+
+  def install
+    system "autoreconf", "--no-recursive" if build.head?
+
+    # In Homebrew's 'superenv' sed's path will be incompatible, so
+    # the correct path is passed into configure here.
+    args = %W[
+      --prefix=#{prefix}
+      --with-extra-functionsdir=#{HOMEBREW_PREFIX}/share/fish/vendor_functions.d
+      --with-extra-completionsdir=#{HOMEBREW_PREFIX}/share/fish/vendor_completions.d
+      --with-extra-confdir=#{HOMEBREW_PREFIX}/share/fish/vendor_conf.d
+      SED=/usr/bin/sed
+    ]
+    system "./configure", *args
+    system "make", "install"
+  end
+
+  def caveats; <<~EOS
+    You will need to add:
+      #{HOMEBREW_PREFIX}/bin/fish
+    to /etc/shells.
+
+    Then run:
+      chsh -s #{HOMEBREW_PREFIX}/bin/fish
+    to make fish your default shell.
+    EOS
+  end
+
+  def post_install
+    (pkgshare/"vendor_functions.d").mkpath
+    (pkgshare/"vendor_completions.d").mkpath
+    (pkgshare/"vendor_conf.d").mkpath
+  end
+
+  test do
+    system "#{bin}/fish", "-c", "echo"
+  end
+end

test/remove_sdkman.sh

@@ -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'

test/wrapper.fish

@@ -15,8 +15,14 @@ set check_count (math "3 * $test_count")
 
 set sdk_init "$HOME/.sdkman/bin/sdkman-init.sh"
 
-function checksum -a file
+if [ (uname) = "Linux" ]
+  function checksum -a file
       sha256sum $file | cut -d " " -f 1
+  end
+else # assume macOS
+  function checksum -a file
+      shasum -a 256 $file | cut -d " " -f 1
+  end
 end
 
 echo "Testing the sdk wrapper"