From bfe441fb2f9fc3b623acb59ce6f530ce4acad5d3 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 16 Jul 2024 18:06:41 +0200 Subject: [PATCH] Require NVAlert, fix SHA256 check --- Package.resolved | 15 +++++++++++++++ Package.swift | 3 +-- Sources/AppUpdater/API/SelfUpdater.swift | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..0db1349 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "0b9d136f905253e9368420218eda771d18cfa528b15553cb08a34c9e5ecdfea7", + "pins" : [ + { + "identity" : "nvalert", + "kind" : "remoteSourceControl", + "location" : "https://github.com/nicoverbruggen/NVAlert", + "state" : { + "revision" : "2d649465067e3fc053bc64beed0e2ffea7e1cbe2", + "version" : "1.0.0" + } + } + ], + "version" : 3 +} diff --git a/Package.swift b/Package.swift index 55c69ed..14e9d87 100644 --- a/Package.swift +++ b/Package.swift @@ -10,8 +10,7 @@ let package = Package( .library(name: "NVAppUpdater", targets: ["NVAppUpdater"]), ], dependencies: [ - .package(name: "NVAlert", path: "/Users/nicoverbruggen/Code/SwiftPM/NVAlert"), - // .package(url: "https://github.com/nicoverbruggen/NVAlert", branch: "main") + .package(url: "https://github.com/nicoverbruggen/NVAlert", from: "1.0.0") ], targets: [ .target(name: "NVAppUpdater", dependencies: ["NVAlert"]), diff --git a/Sources/AppUpdater/API/SelfUpdater.swift b/Sources/AppUpdater/API/SelfUpdater.swift index 35c5586..b070b81 100644 --- a/Sources/AppUpdater/API/SelfUpdater.swift +++ b/Sources/AppUpdater/API/SelfUpdater.swift @@ -107,7 +107,7 @@ open class SelfUpdater: NSObject, NSApplicationDelegate { } // Calculate the checksum for the downloaded file - let checksum = system("openssl dgst -sha256 \"\(updaterPath)/\(filename)\" | awk '{Log.text $NF}'") + let checksum = system("openssl dgst -sha256 \"\(updaterPath)/\(filename)\" | awk '{print $NF}'") .trimmingCharacters(in: .whitespacesAndNewlines) // Compare the checksums