Skip to content

Commit

Permalink
Merge branch 'main' of github.com:propensive/fury
Browse files Browse the repository at this point in the history
  • Loading branch information
propensive committed Jun 17, 2024
2 parents c8db735 + 9f9c420 commit faa830b
Show file tree
Hide file tree
Showing 11 changed files with 263 additions and 262 deletions.
16 changes: 8 additions & 8 deletions src/cli/actions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ object actions:
val directories = Installer.candidateTargets().map(_.path)

if directories.length <= 1 then Installer.install(force) else
info(e"$Italic(Please choose an install location.)")
log(e"$Italic(Please choose an install location.)")

interactive:
SelectMenu(directories, directories.head).ask: target =>
info(e"Installing to $target/${service.scriptName}")
info(Installer.install(force = true, target).communicate)
log(e"Installing to $target/${service.scriptName}")
log(Installer.install(force = true, target).communicate)

if !noTabCompletions then Out.println(TabCompletions.install(force = true).communicate)

Expand All @@ -98,7 +98,7 @@ object actions:
: ExitStatus raises UserError =

tend:
info(Installer.install(force).communicate)
log(Installer.install(force).communicate)
if !noTabCompletions then info(TabCompletions.install(force = true).communicate)
ExitStatus.Ok
.remedy:
Expand All @@ -117,12 +117,12 @@ object actions:
safely(installation.work.wipe())

val size = safely(size0 - installation.cache.as[Directory].size()).or(0.b)
info(t"$size was cleaned up")
log(t"$size was cleaned up")
ExitStatus.Ok

object cache:
def clean()(using FrontEnd): ExitStatus raises UserError =
info(msg"Cleaning the cache")
log(msg"Cleaning the cache")
Cache.clear()
ExitStatus.Ok

Expand Down Expand Up @@ -166,7 +166,7 @@ object actions:
case vault: Vault =>
e"$DeepSkyBlue(${vault.name})")

info(table.tabulate(projects))
log(table.tabulate(projects))
ExitStatus.Ok

object project:
Expand Down Expand Up @@ -321,5 +321,5 @@ object actions:
abort(UserError(msg"No subcommand was specified."))

def versionInfo()(using FrontEnd): ExitStatus =
info(msg"Fury version 1.0")
log(msg"Fury version 1.0")
ExitStatus.Ok
Loading

0 comments on commit faa830b

Please sign in to comment.