Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

Usability improvements

Kabir Oberai64992c2317f5
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index db735c8..1661fe7 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v4
- name: Build
run: |
- docker compose run --build --rm supersign -c "cd Linux && ./build.sh"
+ docker compose run --build --rm supersign -c Linux/build.sh
- name: Release
uses: softprops/action-gh-release@v2
with:
diff --git a/Linux/build.sh b/Linux/build.sh
index 7bd25c4..36f557c 100755
--- a/Linux/build.sh
+++ b/Linux/build.sh
@@ -3,6 +3,8 @@
set -e
shopt -s nullglob
+cd "$(dirname "$0")"
+
# installer version
export VERSION="1.0.0"
diff --git a/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift b/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift
index 27d5bdc..af3cefc 100644
--- a/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift
+++ b/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift
@@ -1,16 +1,6 @@
import Foundation
import Crypto
-enum HashingError: Error {
- case hashingFailed
-}
-
-private extension Data {
- func sha256() throws -> [UInt8] {
- Array(SHA256.hash(data: self))
- }
-}
-
public protocol RawADIProvider {
func clientInfo() async throws -> String
@@ -91,7 +81,9 @@ public final class ADIDataProvider: AnisetteDataProvider {
self.localUserUID = localUserUID
}
// localUserID = SHA256(local user UID)
- self.localUserID = try Data(localUserUID.uuidString.utf8).sha256().map { String(format: "%02X", $0) }.joined()
+ self.localUserID = SHA256.hash(data: Data(localUserUID.uuidString.utf8))
+ .map { String(format: "%02X", $0) }
+ .joined()
}
private static let localUserUIDKey = "SUPLocalUserUID"
@@ -261,3 +253,7 @@ public final class ADIDataProvider: AnisetteDataProvider {
}
}
+
+public struct ADIError: Error {
+ public var code: Int
+}
diff --git a/Sources/Supersign/GrandSlam/Anisette/SupersetteADIProvider.swift b/Sources/Supersign/GrandSlam/Anisette/SupersetteADIProvider.swift
index 2630658..5325fe0 100644
--- a/Sources/Supersign/GrandSlam/Anisette/SupersetteADIProvider.swift
+++ b/Sources/Supersign/GrandSlam/Anisette/SupersetteADIProvider.swift
@@ -163,7 +163,7 @@ public struct SupersetteADIProvider: RawADIProvider {
private func check(_ adiStatus: Int32) throws {
guard adiStatus == 0 else {
- fatalError("ADI Status: \(adiStatus)")
+ throw ADIError(code: Int(adiStatus))
}
}