From e204c65709fbb085f3b4a6a924962476fb2c7c11 Mon Sep 17 00:00:00 2001 From: zaneli Date: Sat, 16 Dec 2017 01:37:50 +0900 Subject: [PATCH 1/7] Add dotty-0.3.0-RC1~0.5.0-RC1 --- plugins/scala-install/share/dotty-0.3.0-RC1 | 4 ++++ plugins/scala-install/share/dotty-0.3.0-RC2 | 4 ++++ plugins/scala-install/share/dotty-0.4.0-RC1 | 4 ++++ plugins/scala-install/share/dotty-0.5.0-RC1 | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 plugins/scala-install/share/dotty-0.3.0-RC1 create mode 100644 plugins/scala-install/share/dotty-0.3.0-RC2 create mode 100644 plugins/scala-install/share/dotty-0.4.0-RC1 create mode 100644 plugins/scala-install/share/dotty-0.5.0-RC1 diff --git a/plugins/scala-install/share/dotty-0.3.0-RC1 b/plugins/scala-install/share/dotty-0.3.0-RC1 new file mode 100644 index 0000000..eb2de62 --- /dev/null +++ b/plugins/scala-install/share/dotty-0.3.0-RC1 @@ -0,0 +1,4 @@ +sites=( + "https://github.com/lampepfl/dotty/releases/download/0.3.0-RC1" + ); +archive_file="dotty-0.3.0-RC1.tar.gz" diff --git a/plugins/scala-install/share/dotty-0.3.0-RC2 b/plugins/scala-install/share/dotty-0.3.0-RC2 new file mode 100644 index 0000000..3e71b41 --- /dev/null +++ b/plugins/scala-install/share/dotty-0.3.0-RC2 @@ -0,0 +1,4 @@ +sites=( + "https://github.com/lampepfl/dotty/releases/download/0.3.0-RC2" + ); +archive_file="dotty-0.3.0-RC2.tar.gz" diff --git a/plugins/scala-install/share/dotty-0.4.0-RC1 b/plugins/scala-install/share/dotty-0.4.0-RC1 new file mode 100644 index 0000000..b1d3ad4 --- /dev/null +++ b/plugins/scala-install/share/dotty-0.4.0-RC1 @@ -0,0 +1,4 @@ +sites=( + "https://github.com/lampepfl/dotty/releases/download/0.4.0-RC1" + ); +archive_file="dotty-0.4.0-RC1.tar.gz" diff --git a/plugins/scala-install/share/dotty-0.5.0-RC1 b/plugins/scala-install/share/dotty-0.5.0-RC1 new file mode 100644 index 0000000..0aa431b --- /dev/null +++ b/plugins/scala-install/share/dotty-0.5.0-RC1 @@ -0,0 +1,4 @@ +sites=( + "https://github.com/lampepfl/dotty/releases/download/0.5.0-RC1" + ); +archive_file="dotty-0.5.0-RC1.tar.gz" From 8703f91fde58b02923fea96456a0b86b8d426163 Mon Sep 17 00:00:00 2001 From: zaneli Date: Fri, 23 Mar 2018 18:56:14 +0900 Subject: [PATCH 2/7] Add scala-2.12.5 --- plugins/scala-install/share/scala-2.12.5 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 plugins/scala-install/share/scala-2.12.5 diff --git a/plugins/scala-install/share/scala-2.12.5 b/plugins/scala-install/share/scala-2.12.5 new file mode 100644 index 0000000..b610d81 --- /dev/null +++ b/plugins/scala-install/share/scala-2.12.5 @@ -0,0 +1,4 @@ +sites=( + "http://www.scala-lang.org/files/archive" + ); +archive_file="scala-2.12.5.tgz" From 7b7a80986fa28356cd4a88ab3c0aa152f17b176d Mon Sep 17 00:00:00 2001 From: Anderson Mesquita Date: Sat, 14 Apr 2018 01:41:10 +0200 Subject: [PATCH 3/7] Run rehash command in the background The rehash command doesn't take too long to run, but can add up when several *env projects (rbenv, pyenv, nodenv, etc) are installed at the same time. This makes it run in the background so that you don't have to skip it altogether (using the `--no-rehash` flag) but also don't have to wait a lot during shell initialization. The `()` around the command prevent it from displaying the job number or the "job done" message once it finishes. --- libexec/scalaenv-init | 2 +- test/init.bats | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/scalaenv-init b/libexec/scalaenv-init index 1ffdd88..ee71ec1 100755 --- a/libexec/scalaenv-init +++ b/libexec/scalaenv-init @@ -102,7 +102,7 @@ if [ -r "$completion" ]; then fi if [ -z "${no_rehash}" ]; then - echo 'command scalaenv rehash 2>/dev/null' + echo '(command scalaenv rehash 2>/dev/null &)' fi commands=(`scalaenv-commands --sh`) diff --git a/test/init.bats b/test/init.bats index e1b8f0d..27ab92d 100644 --- a/test/init.bats +++ b/test/init.bats @@ -14,7 +14,7 @@ load test_helper @test "auto rehash" { run scalaenv-init - assert_success - assert_line "command scalaenv rehash 2>/dev/null" + assert_line "(command scalaenv rehash 2>/dev/null &)" } @test "detect parent shell" { From cb8dbd79ee921e5fd336d3e3d7982f01d78f7584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B5=9C=E5=B7=B7?= Date: Mon, 21 May 2018 10:57:09 +0900 Subject: [PATCH 4/7] #55 can't execute on fish-shell (#56) --- libexec/scalaenv-init | 9 ++++++++- test/init.bats | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) mode change 100644 => 100755 test/init.bats diff --git a/libexec/scalaenv-init b/libexec/scalaenv-init index ee71ec1..9618609 100755 --- a/libexec/scalaenv-init +++ b/libexec/scalaenv-init @@ -102,7 +102,14 @@ if [ -r "$completion" ]; then fi if [ -z "${no_rehash}" ]; then - echo '(command scalaenv rehash 2>/dev/null &)' + case "$shell" in + fish ) + echo 'true (command scalaenv rehash 2>/dev/null &)' + ;; + * ) + echo '(command scalaenv rehash 2>/dev/null &)' + ;; + esac fi commands=(`scalaenv-commands --sh`) diff --git a/test/init.bats b/test/init.bats old mode 100644 new mode 100755 index 27ab92d..8c5c568 --- a/test/init.bats +++ b/test/init.bats @@ -12,11 +12,17 @@ load test_helper } @test "auto rehash" { - run scalaenv-init - + run scalaenv-init - bash assert_success assert_line "(command scalaenv rehash 2>/dev/null &)" } +@test "auto rehash (fish)" { + run scalaenv-init - fish + assert_success + assert_line "true (command scalaenv rehash 2>/dev/null &)" +} + @test "detect parent shell" { SHELL=/bin/false run scalaenv-init - assert_success From 665bf9eaaee01a11c5b4ad91a676f879e6e7eee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20M=C3=B6ller?= Date: Sun, 10 Jun 2018 10:33:14 +0200 Subject: [PATCH 5/7] Add scala-2.12.6 --- plugins/scala-install/share/scala-2.12.6 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 plugins/scala-install/share/scala-2.12.6 diff --git a/plugins/scala-install/share/scala-2.12.6 b/plugins/scala-install/share/scala-2.12.6 new file mode 100644 index 0000000..d937a7f --- /dev/null +++ b/plugins/scala-install/share/scala-2.12.6 @@ -0,0 +1,4 @@ +sites=( + "http://www.scala-lang.org/files/archive" + ); +archive_file="scala-2.12.6.tgz" From 85e89ef31d7f67b1ce0bb35e60b10a302ac67635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20M=C3=B6ller?= Date: Sun, 10 Jun 2018 10:36:07 +0200 Subject: [PATCH 6/7] Add scala-2.13.0-M4 --- plugins/scala-install/share/scala-2.13.0-M4 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 plugins/scala-install/share/scala-2.13.0-M4 diff --git a/plugins/scala-install/share/scala-2.13.0-M4 b/plugins/scala-install/share/scala-2.13.0-M4 new file mode 100644 index 0000000..acd6e35 --- /dev/null +++ b/plugins/scala-install/share/scala-2.13.0-M4 @@ -0,0 +1,4 @@ +sites=( + "http://www.scala-lang.org/files/archive" + ); +archive_file="scala-2.13.0-M4.tgz" From 18693788372cdd35609a625540100d671bdd7c7c Mon Sep 17 00:00:00 2001 From: Yusuke Izawa Date: Sun, 9 Sep 2018 20:25:20 +0900 Subject: [PATCH 7/7] fix #59 --- plugins/scala-install/bin/scalaenv-install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/scala-install/bin/scalaenv-install b/plugins/scala-install/bin/scalaenv-install index f856979..31c61f8 100755 --- a/plugins/scala-install/bin/scalaenv-install +++ b/plugins/scala-install/bin/scalaenv-install @@ -63,8 +63,7 @@ usage () { } definitions() { - local query="$1" - scala-build --definitions | $(type -p ggrep grep | head -1) -F "$query" || true + ls -1 "$(abs_dirname $0/../../share/)" | grep -v '^d' } indent() {