Skip to content

Commit d153427

Browse files
committed
Ensure argvOpt is properly set for the default command
1 parent 66dd929 commit d153427

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

modules/cli/src/main/scala/scala/cli/ScalaCliCommands.scala

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ class ScalaCliCommands(
112112
case c: NeedsArgvCommand => c.setArgv(progName +: args)
113113
case _ =>
114114
}
115+
actualDefaultCommand.setArgv(progName +: args)
115116

116117
val processedArgs =
117118
if (args.lengthCompare(1) > 0 && isShebangFile(args(0)))

modules/integration/src/test/scala/scala/cli/integration/DefaultTests.scala

+12-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DefaultTests extends ScalaCliSuite {
1818
check = false
1919
)
2020
expect(res.exitCode == 1)
21-
expect(res.out.trim == s"Unrecognized argument: $runSpecificOption")
21+
expect(res.out.trim == unrecognizedArgMessage(runSpecificOption))
2222
}
2323
}
2424
test("running scala-cli with args should not accept repl-only options") {
@@ -30,7 +30,17 @@ class DefaultTests extends ScalaCliSuite {
3030
check = false
3131
)
3232
expect(res.exitCode == 1)
33-
expect(res.out.trim == s"Unrecognized argument: $replSpecificOption")
33+
expect(res.out.trim == unrecognizedArgMessage(replSpecificOption))
3434
}
3535
}
36+
37+
private def unrecognizedArgMessage(argName: String) = {
38+
val scalaCli = if (TestUtil.isNativeCli) TestUtil.cliPath else "scala-cli"
39+
s"""
40+
|Unrecognized argument: $argName
41+
|
42+
|To list all available options, run
43+
| ${Console.BOLD}$scalaCli --help${Console.RESET}
44+
|""".stripMargin.trim
45+
}
3646
}

0 commit comments

Comments
 (0)