diff --git a/forge.nimble b/forge.nimble index 43c9c81..be3a438 100644 --- a/forge.nimble +++ b/forge.nimble @@ -8,4 +8,4 @@ binDir = "bin" requires "nim >= 2.0.0" -requires "https://github.com/daylinmorgan/hwylterm#3cf572ea" +requires "https://github.com/daylinmorgan/hwylterm#a88765" diff --git a/nimble.lock b/nimble.lock index fb4ed2f..a82a543 100644 --- a/nimble.lock +++ b/nimble.lock @@ -3,12 +3,12 @@ "packages": { "hwylterm": { "version": "0.1.0", - "vcsRevision": "3cf572ea4afa6f895eb0897bfb8e6e35f8f1e953", + "vcsRevision": "a88765e328e3d39e0aca64e571628ada6c4da545", "url": "https://github.com/daylinmorgan/hwylterm", "downloadMethod": "git", "dependencies": [], "checksums": { - "sha1": "bf33d39e2a451b89fbbff6418569ccd5428b6bfd" + "sha1": "e86d701785783cdc2ffe95ae10e3d43941da5a16" } } }, diff --git a/src/forge.nim b/src/forge.nim index afbd28a..97f0e31 100644 --- a/src/forge.nim +++ b/src/forge.nim @@ -132,6 +132,8 @@ when isMainModule: [cc] ... "compile with zig cc" + positionals: + args seq[string] flags: ^[shared] target: @@ -146,12 +148,13 @@ when isMainModule: generate release assets for n>=1 targets format argument: - format is a template string used for each target directory - available fields are name, version, target - default: ${name}-v${verison}-${target} + format is a template string used for each target directory + available fields are [b i]name, version, target[/] if name or version are not specified they will be inferred from the local .nimble file """ + positionals: + args seq[string] flags: ^[shared] verbose: @@ -160,15 +163,16 @@ when isMainModule: target: T seq[string] ? "set target, may be repeated" - * @[] + * newSeq[string]() - t bin: T seq[string] ? "set bin, may be repeated" - * @[] + * newSeq[string]() format: T string - ? "set format, see help above" + ? "set format" + * "${name}-v${version}-${target}" `config-file`: T string ? "path to config" diff --git a/src/forge/config.nim b/src/forge/config.nim index a170492..a829e33 100644 --- a/src/forge/config.nim +++ b/src/forge/config.nim @@ -130,10 +130,7 @@ proc newConfig*( if result.version == "": result.version = inferVersion(version, nimbleFile) if result.format == "": - if format != "": - result.format = format - else: - result.format = "${name}-v${version}-${target}" + result.format = format for t in targets: result.targets[t] = ""