Backport template repository updating fix from v3

Now makes sure to checkout the right branch when pulling for the
first time AND when updating the repository

Author: stackotter

Sources/swift-bundler/Bundler/Templater/Templater.swift

@@ -218,18 +218,32 @@ enum Templater {
   static func updateTemplates() -> Result<Void, TemplaterError> {
     return getDefaultTemplatesDirectory(downloadIfNecessary: false)
       .flatMap { templatesDirectory in
-        if FileManager.default.itemExists(at: templatesDirectory, withType: .directory) {
-          let process = Process.create(
-            "/usr/bin/git",
-            arguments: ["pull"],
-            directory: templatesDirectory)
-          if case let .failure(error) = process.runAndWait() {
-            return .failure(.failedToPullLatestTemplates(error))
-          }
-          return .success()
-        } else {
+        print(templatesDirectory)
+        guard FileManager.default.itemExists(at: templatesDirectory, withType: .directory) else {
           return downloadDefaultTemplates(into: templatesDirectory)
         }
+
+        return Process.create(
+          "/usr/bin/git",
+          arguments: [
+            "fetch"
+          ],
+          directory: templatesDirectory
+        ).runAndWait().flatMap { _ in
+          Process.create(
+            "/usr/bin/git",
+            arguments: [
+              "checkout", "v\(SwiftBundler.version.major)",
+            ],
+            directory: templatesDirectory
+          ).runAndWait()
+        }.flatMap { _ in
+          Process.create(
+            "/usr/bin/git",
+            arguments: ["pull"],
+            directory: templatesDirectory
+          ).runAndWait()
+        }.mapError(TemplaterError.failedToPullLatestTemplates)
       }
   }
 
@@ -296,7 +310,8 @@ enum Templater {
     let process = Process.create(
       "/usr/bin/git",
       arguments: [
-        "clone", "\(defaultTemplateRepository)",
+        "clone", "-b", "v\(SwiftBundler.version.major)",
+        "\(defaultTemplateRepository)",
         directory.path
       ])
 

Sources/swift-bundler/SwiftBundler.swift

@@ -1,13 +1,16 @@
 import Foundation
 import ArgumentParser
 import Darwin
+import Version
 
 /// The root command of Swift Bundler.
 struct SwiftBundler: ParsableCommand {
+  public static let version = Version(2, 0, 7)
+
   static let configuration = CommandConfiguration(
     commandName: "swift-bundler",
     abstract: "A tool for creating macOS apps from Swift packages.",
-    version: "v2.0.3",
+    version: "v" + version.description,
     shouldDisplay: true,
     subcommands: [
       BundleCommand.self,