From 0b94b68fb5233ee175ebfe9085da9cafea4920d4 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 13 Aug 2020 22:56:02 -0400 Subject: [PATCH] Rename to sbtn --- .appveyor.yml | 10 +++++----- build.sbt | 6 +++--- client/completions/{_sbtc => _sbtn} | 2 +- client/completions/sbtc.fish | 4 ---- client/completions/sbtc.ps1 | 10 ---------- client/completions/{sbtc.bash => sbtn.bash} | 4 ++-- client/completions/sbtn.fish | 4 ++++ client/completions/sbtn.ps1 | 10 ++++++++++ server-test/src/test/scala/testpkg/ClientTest.scala | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) rename client/completions/{_sbtc => _sbtn} (90%) delete mode 100755 client/completions/sbtc.fish delete mode 100644 client/completions/sbtc.ps1 rename client/completions/{sbtc.bash => sbtn.bash} (54%) create mode 100755 client/completions/sbtn.fish create mode 100644 client/completions/sbtn.ps1 diff --git a/.appveyor.yml b/.appveyor.yml index 373dc1ac9..a4ceb59ef 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,8 +19,8 @@ for: only: - build-graal artifacts: - - path: client/target/bin/sbtc - name: sbtc + - path: client/target/bin/sbtn + name: sbtn install: - curl -sL https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.tgz > ~/sbt-bin.tgz @@ -50,7 +50,7 @@ for: only: - build-graal artifacts: - - path: client/target/bin/sbtc + - path: client/target/bin/sbtn name: mac-native-sbt-client install: @@ -81,8 +81,8 @@ for: - build-graal artifacts: - - path: client\target\bin\sbtc.exe - name: sbtc.exe + - path: client\target\bin\sbtn.exe + name: sbtn.exe install: - cinst jdk8 -params 'installdir=C:\\jdk8' - SET CI=true diff --git a/build.sbt b/build.sbt index af9868dc6..270d6376f 100644 --- a/build.sbt +++ b/build.sbt @@ -215,7 +215,7 @@ lazy val sbtRoot: Project = (project in file(".")) case Some(p) => file(p).toPath case _ => dir match { - case Some(d) => d / "sbtc" + case Some(d) => d / "sbtn" case _ => val msg = "Expected input parameter : installNativeExecutable /usr/local/bin" throw new IllegalStateException(msg) @@ -1125,7 +1125,7 @@ lazy val sbtClientProj = (project in file("client")) } }, thinClientNativeImageCommand := System.getProperty("sbt.native-image", "native-image").toString, - buildNativeThinClient / name := s"sbtc${if (isWin) ".exe" else ""}", + buildNativeThinClient / name := s"sbtn${if (isWin) ".exe" else ""}", nativeThinClientPath := target.value.toPath / "bin" / (buildNativeThinClient / name).value, thinClientNativeImageClass := "sbt.client.Client", buildNativeThinClient := { @@ -1168,7 +1168,7 @@ lazy val sbtClientProj = (project in file("client")) "-H:IncludeResourceBundles=jline.console.completer.CandidateListCompletionHandler", "-H:+ReportExceptionStackTraces", "-H:-ParseRuntimeOptions", - s"-H:Name=${target.value / "bin" / "sbtc"}", + s"-H:Name=${target.value / "bin" / "sbtn"}", ), buildThinClient := { val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish") diff --git a/client/completions/_sbtc b/client/completions/_sbtn similarity index 90% rename from client/completions/_sbtc rename to client/completions/_sbtn index ff91fd0cf..ccaab5460 100755 --- a/client/completions/_sbtc +++ b/client/completions/_sbtn @@ -1,4 +1,4 @@ -#compdef sbtc +#compdef sbtn COMPLETE="--completions=${words[@]}" COMPLETIONS=($(sbtc --no-tab ${COMPLETE})) diff --git a/client/completions/sbtc.fish b/client/completions/sbtc.fish deleted file mode 100755 index 8c2f1d17c..000000000 --- a/client/completions/sbtc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function __sbtcomp - sbtc --completions="$argv" -end -complete --command sbtc -f --arguments '(__sbtcomp (commandline -cp))' diff --git a/client/completions/sbtc.ps1 b/client/completions/sbtc.ps1 deleted file mode 100644 index 1ab4eea5f..000000000 --- a/client/completions/sbtc.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -$scriptblock = { - param($commandName, $line, $position) - $len = $line.ToString().length - $spaces = " " * ($position - $len) - $arg="--completions=$line$spaces" - & 'sbtc.exe' @('--no-tab', '--no-stderr', $arg) -} -Set-Alias -Name sbtc -Value sbtc.exe -Register-ArgumentCompleter -CommandName sbtc.exe -ScriptBlock $scriptBlock -Register-ArgumentCompleter -CommandName sbtc -ScriptBlock $scriptBlock diff --git a/client/completions/sbtc.bash b/client/completions/sbtn.bash similarity index 54% rename from client/completions/sbtc.bash rename to client/completions/sbtn.bash index 565231e1a..bb501f1d1 100644 --- a/client/completions/sbtc.bash +++ b/client/completions/sbtn.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash -_do_sbtc_completions() { +_do_sbtn_completions() { COMPREPLY=($(sbtc "--completions=${COMP_LINE}")) } -complete -F _do_sbtc_completions sbtc +complete -F _do_sbtn_completions sbtn diff --git a/client/completions/sbtn.fish b/client/completions/sbtn.fish new file mode 100755 index 000000000..45e2e5e15 --- /dev/null +++ b/client/completions/sbtn.fish @@ -0,0 +1,4 @@ +function __sbtcomp + sbtc --completions="$argv" +end +complete --command sbtn -f --arguments '(__sbtcomp (commandline -cp))' diff --git a/client/completions/sbtn.ps1 b/client/completions/sbtn.ps1 new file mode 100644 index 000000000..0e8b7d851 --- /dev/null +++ b/client/completions/sbtn.ps1 @@ -0,0 +1,10 @@ +$scriptblock = { + param($commandName, $line, $position) + $len = $line.ToString().length + $spaces = " " * ($position - $len) + $arg="--completions=$line$spaces" + & 'sbtn.exe' @('--no-tab', '--no-stderr', $arg) +} +Set-Alias -Name sbtn -Value sbtn.exe +Register-ArgumentCompleter -CommandName sbtn.exe -ScriptBlock $scriptBlock +Register-ArgumentCompleter -CommandName sbtn -ScriptBlock $scriptBlock diff --git a/server-test/src/test/scala/testpkg/ClientTest.scala b/server-test/src/test/scala/testpkg/ClientTest.scala index bdb71b513..6643fc6e6 100644 --- a/server-test/src/test/scala/testpkg/ClientTest.scala +++ b/server-test/src/test/scala/testpkg/ClientTest.scala @@ -58,7 +58,7 @@ object ClientTest extends AbstractServerTest { val cps = new CachingPrintStream NetworkClient.complete( testPath.toFile, - Array(s"--completions=sbtc $completionString"), + Array(s"--completions=sbtn $completionString"), false, tabs, cps