Fix the self update for macOS so that the installer is executed (#441)

* Fix the self update for macOS so that the installer is executed * Bump swift version to pass CI * Skip ubuntu 20.04 check since it is no longer supported by Swift * Bump minor version for init auto-upgrade * Include an entry for both minor versions

Author: cmcgee1024

.github/workflows/pull_request.yml

@@ -39,7 +39,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- container: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04", "redhat/ubi9", "debian:12", "fedora:39"]
+ container: ["ubuntu:22.04", "ubuntu:24.04", "redhat/ubi9", "debian:12", "fedora:39"]
  container:
  image: ${{ matrix.container }}
  steps:

.swift-version

@@ -1 +1 @@
-6.1.0
+6.2.0

Sources/MacOSPlatform/MacOS.swift

@@ -117,10 +117,10 @@ public struct MacOS: Platform {
 
  if ctx.mockedHomeDir == nil {
  await ctx.message("Extracting the swiftly package...")
- _ = sys.installer(
+ try await sys.installer(
  .pkg(archive),
  .target("CurrentUserHomeDirectory")
- )
+ ).run(self)
  try? await sys.pkgutil(.volume(userHomeDir)).forget(pkg_id: "org.swift.swiftly").run(self)
  } else {
  let installDir = userHomeDir / ".swiftly"

Sources/Swiftly/Init.swift

@@ -48,7 +48,8 @@ struct Init: SwiftlyCommand {
  (
  config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0, suffix: "dev") ||
  config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0) ||
- (config.version.major == 1 && config.version.minor == 0)
+ (config.version.major == 1 && config.version.minor == 0) ||
+ (config.version.major == 1 && config.version.minor == 1)
  )
  {
  // This is a simple upgrade from the 0.4.0 pre-releases, or 1.x