Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ReleaseTooling/Sources/ZipBuilder/FirebaseBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct FirebaseBuilder {
guard let repoDir = args.repoDir else {
fatalError("repoDir option must be specified when building Carthage")
}
let carthageJSONDir = repoDir.appendingPathComponents(["ZipBuilder", "CarthageJSON"])
let carthageJSONDir = repoDir.appendingPathComponents(["ReleaseTooling", "CarthageJSON"])
carthageRoot = CarthageUtils.packageCarthageRelease(templateDir: args.templateDir,
carthageJSONDir: carthageJSONDir,
artifacts: artifacts,
Expand Down
4 changes: 2 additions & 2 deletions ReleaseTooling/Sources/ZipBuilder/LaunchArgs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ struct LaunchArgs {
// Get the project template directory, and fail if it doesn't exist.
var templatePath = defaults.string(forKey: Key.templateDir.rawValue)
if templatePath == nil, let repoDir = repoDir {
templatePath = repoDir.path + "/ZipBuilder/Template"
templatePath = repoDir.path + "/ReleaseTooling/Template"
}
if templatePath == nil {
LaunchArgs.exitWithUsageAndLog("Missing required key: `\(Key.templateDir)` for the folder " +
Expand Down Expand Up @@ -332,7 +332,7 @@ struct LaunchArgs {
print(errorText)

// Loop over all the possible keys and print their description.
print("Usage: `swift run ZipBuilder [ARGS]` where args are:")
print("Usage: `swift run zip-builder [ARGS]` where args are:")
for option in Key.allCases {
print("""
-\(option.rawValue) <VALUE>
Expand Down