Merge pull request #4 from freddi-kit/fix-lipo

Fix lipo
freddi-kit · Aug 16, 2023 · 7289d92 · 7289d92
2 parents 64bdd7c + bf02f5a
commit 7289d92
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Plugins/ArtifactBundleGenCommand/ArtifactBundleGenCommand.swift b/Plugins/ArtifactBundleGenCommand/ArtifactBundleGenCommand.swift
@@ -18,7 +18,7 @@ struct ArtifactBundleGenCommand: CommandPlugin {
         }
 
         guard let configString = configOption.first, let config = Config(rawValue: configString) else {
-            throw ArtifactBundleGenError.configOptionParseError(configString: configOption.first ?? "{empty}")
+            throw ArtifactBundleGenError.configOptionParseError(configString: configOption.first)
         }
 
         let artifactBundleGen = ArtifactBundleGen(

diff --git a/README.md b/README.md
@@ -82,5 +82,4 @@ $ ls
 
 
 ## TODOs
-- [ ] include LICENSE file
-- [ ] Suport other type
+- [ ] Suport XCFramework
diff --git a/Sources/ArtifactBundleGen/Error/ArtifactBundleGenError.swift b/Sources/ArtifactBundleGen/Error/ArtifactBundleGenError.swift
@@ -19,7 +19,7 @@ enum ArtifactBundleGenError: LocalizedError, CustomStringConvertible {
     case cleanFailure(error: Error)
 
     case nameOptionMissing
-    case configOptionParseError(configString: String)
+    case configOptionParseError(configString: String?)
 
     var description: String { return errorDescription ?? "Unexpected Error" }
 
@@ -29,8 +29,13 @@ enum ArtifactBundleGenError: LocalizedError, CustomStringConvertible {
         case .fileCopyFailure(let origin, let destination, let error): return "Failed to copy file from \"\(origin)\" to \"\(destination)\" : \(error.localizedDescription)"
         case .lipoFailure(let error): return "Failed to run lipo: \(error.localizedDescription)"
         case .lipoEmptyResult: return "Error, lipo returns empty result"
-        case .nameOptionMissing: return "Please specify to name by --package-name"
-        case .configOptionParseError(let configString): return "Failed to parse config specified by --build-config: \(configString)"
+        case .nameOptionMissing: return "Please specify to name by --executable-name"
+        case .configOptionParseError(let configString):
+            if let configString {
+                return "Failed to parse config specified by --build-config: \(configString)"
+            } else {
+                return "Failed to parse config specified by --build-config: Please specify release or debug"
+            }
         case .zipFailure(error: let error): return "Failed to zip artifact bundle: \(error.localizedDescription)"
         case .cleanFailure(error: let error): return "Failed to clean artifact bundle: \(error.localizedDescription)"
         }

diff --git a/Sources/ArtifactBundleGen/Utils/LipoRunnner.swift b/Sources/ArtifactBundleGen/Utils/LipoRunnner.swift
@@ -7,8 +7,7 @@ class LipoRunnner {
 
         task.standardOutput = pipe
         task.standardError = pipe
-        task.launchPath = "/usr/bin/xcrun"
-        task.arguments = ["lipo", "-archs", "\(targetPath)"]
+        task.arguments = ["-c", "lipo -archs \(targetPath)"]
         task.launchPath = "/bin/zsh"
         task.standardInput = nil
         do {