Fixed bug introduced in last commit/build

ryangball · May 30, 2019 · 4f9dafc · 4f9dafc
1 parent d195dc8
commit 4f9dafc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Launchd Package Creator/ViewController.swift b/Launchd Package Creator/ViewController.swift
@@ -160,6 +160,7 @@ class ViewController: NSViewController {
             programArgs.isEnabled = false
             programArgs.stringValue = ""
             programArgsOptLabel.isHidden = false
+            usingApp = false
         } else if targetExtension == "app" {
             // Target has a .app extensin and use set /usr/bin/open as the program args
             programArgs.stringValue = String("/usr/bin/open");
@@ -185,6 +186,7 @@ class ViewController: NSViewController {
                     // Either no shebang or we don't know how to deal with the shebang in the file
                     dialogOK(title: "Missing shebang", message: "Your script does not have a proper shebang as the first line. Either add a shebang into the script and try again or manually configure the Program Arguments.")
                 }
+                usingApp = false
             } catch {
                 // bad things happened
             }

diff --git a/Launchd Package Creator/create_daemon.swift b/Launchd Package Creator/create_daemon.swift
@@ -166,7 +166,13 @@ public class create_daemon: NSObject {
             let pkgBuildDir = sessionTempDir.appendingPathComponent("build/")
             globalPkgTempLocation = "\(pkgBuildDir.path)/hello.pkg"
 
-            shell("/usr/bin/pkgbuild", "--quiet", "--root", "\(pkgRoot.path)", "--install-location", "/", "--scripts", "\(pkgScripts.path)", "--identifier", "\(globalIdentifier)", "--version", "\(globalVersion)", "--ownership", "recommended", "--component-plist", "\(componentPlistURL.path)", "\(globalPkgTempLocation)")
+            if usingApp == true {
+                shell("/usr/bin/pkgbuild", "--quiet", "--root", "\(pkgRoot.path)", "--install-location", "/", "--scripts", "\(pkgScripts.path)", "--identifier", "\(globalIdentifier)", "--version", "\(globalVersion)", "--ownership", "recommended", "--component-plist", "\(componentPlistURL.path)", "\(globalPkgTempLocation)")
+
+            } else {
+                shell("/usr/bin/pkgbuild", "--quiet", "--root", "\(pkgRoot.path)", "--install-location", "/", "--scripts", "\(pkgScripts.path)", "--identifier", "\(globalIdentifier)", "--version", "\(globalVersion)", "--ownership", "recommended", "\(globalPkgTempLocation)")
+            }
+
         }
 
         if buildType == "PKG" {