Rename to sbtn

This commit is contained in:
Eugene Yokota 2020-08-13 22:56:02 -04:00
parent cd47b5c47b
commit 0b94b68fb5
9 changed files with 26 additions and 26 deletions

View File

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

View File

@ -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 <path>: 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")

View File

@ -1,4 +1,4 @@
#compdef sbtc
#compdef sbtn
COMPLETE="--completions=${words[@]}"
COMPLETIONS=($(sbtc --no-tab ${COMPLETE}))

View File

@ -1,4 +0,0 @@
function __sbtcomp
sbtc --completions="$argv"
end
complete --command sbtc -f --arguments '(__sbtcomp (commandline -cp))'

View File

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

View File

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

4
client/completions/sbtn.fish Executable file
View File

@ -0,0 +1,4 @@
function __sbtcomp
sbtc --completions="$argv"
end
complete --command sbtn -f --arguments '(__sbtcomp (commandline -cp))'

View File

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

View File

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