Fixing logic bugs exposed by testing.

ionic-team · Nov 10, 2020 · e30e927 · e30e927
1 parent b641606
commit e30e927
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ios/Capacitor/Capacitor/CAPInstanceDescriptor.swift b/ios/Capacitor/Capacitor/CAPInstanceDescriptor.swift
@@ -9,13 +9,13 @@ internal extension InstanceDescriptor {
     @objc func _parseConfiguration(at capacitorURL: URL?, cordovaConfiguration cordovaURL: URL?) {
         // sanity check that the app directory is valid
         var isDirectory: ObjCBool = ObjCBool(false)
-        guard warnings.contains(.missingAppDir) == false, FileManager.default.fileExists(atPath: appLocation.path, isDirectory: &isDirectory) == true, isDirectory.boolValue == true else {
-            return
+        if warnings.contains(.missingAppDir) == false, (FileManager.default.fileExists(atPath: appLocation.path, isDirectory: &isDirectory) == false || isDirectory.boolValue == false) {
+            warnings.update(with: .missingAppDir)
         }
 
         // parse the capacitor configuration
         var config: JSObject?
-        if let capacitorURL = capacitorURL, FileManager.default.fileExists(atPath: capacitorURL.path, isDirectory: &isDirectory) {
+        if let capacitorURL = capacitorURL, FileManager.default.fileExists(atPath: capacitorURL.path, isDirectory: &isDirectory), isDirectory.boolValue == false {
             do {
                 let contents = try Data(contentsOf: capacitorURL)
                 config = JSTypes.coerceDictionaryToJSObject(try JSONSerialization.jsonObject(with: contents) as? [String: Any])
@@ -29,7 +29,7 @@ internal extension InstanceDescriptor {
 
         // parse the cordova configuration
         var configParser: XMLParser?
-        if let cordovaURL = cordovaURL, FileManager.default.fileExists(atPath: cordovaURL.path, isDirectory: &isDirectory) {
+        if let cordovaURL = cordovaURL, FileManager.default.fileExists(atPath: cordovaURL.path, isDirectory: &isDirectory), isDirectory.boolValue == false {
             configParser = XMLParser(contentsOf: cordovaURL)
         }
         else {