Skip to content

Commit 9f64f71

Browse files
Tweak / fix publish messages (#1535)
1 parent 59adfbc commit 9f64f71

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
334334
private def defaultName(workspace: os.Path, logger: Logger): String = {
335335
val name = workspace.last
336336
logger.message(
337-
s"Using directive publish.name not set, using workspace file name $name as default name"
337+
s"Using directive publish.name not specified, using workspace directory name $name as default name"
338338
)
339339
name
340340
}
@@ -1024,7 +1024,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
10241024
Seq(mod.organization.value, mod.name.value, version)
10251025
else
10261026
mod.organization.value.split('.').toSeq ++ Seq(mod.name.value, version)
1027-
elems.map("/" + _).mkString
1027+
elems.map("/" + _).mkString + "/"
10281028
}
10291029
val path = {
10301030
val url = checkRepo.root.stripSuffix("/") + relPath

modules/cli/src/main/scala/scala/cli/commands/publish/PublishSetup.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ object PublishSetup extends ScalaCommand[PublishSetupOptions] {
125125

126126
if (missingFields.nonEmpty) {
127127
val count = missingFields.length
128-
logger.message(s"$count ${if (count > 1) "options" else "option"} need to be set")
128+
logger.message(s"$count ${if (count > 1) "options need" else "option needs"} to be set")
129129
for (check <- missingFields)
130-
logger.debug(s" ${check.fieldName}")
130+
logger.message(s" ${check.fieldName}")
131131
logger.message("") // printing an empty line, for readability
132132
}
133133

modules/cli/src/main/scala/scala/cli/commands/publish/checks/UrlCheck.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final case class UrlCheck(
2828
case Right((org, name)) =>
2929
val url = s"https://github.com/$org/$name"
3030
logger.message("url:")
31-
logger.message(s" using GitHub repository $url")
31+
logger.message(s" using GitHub repository URL $url")
3232
Some(url)
3333
}
3434
options.publishParams.url

modules/cli/src/main/scala/scala/cli/errors/MissingPublishOptionError.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ final class MissingPublishOptionError(
1111
) extends BuildException(
1212
{
1313
val directivePart =
14-
if (directiveName.isEmpty)
15-
s" or with a 'using $directiveName' directive"
14+
if (directiveName.isEmpty) ""
1615
else
17-
""
16+
s" or with a '//> using $directiveName' directive"
1817
val configPart =
1918
if (configKeys.isEmpty) ""
2019
else

0 commit comments

Comments
 (0)