Moved the import/export block after the checkblock.

google · Sep 12, 2023 · ad90396 · ad90396
1 parent ab22fba
commit ad90396
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/Source/santactl/Commands/SNTCommandRule.m b/Source/santactl/Commands/SNTCommandRule.m
@@ -206,15 +206,6 @@ - (void)runWithArguments:(NSArray *)arguments {
     }
   }
 
-  if (jsonFilePath != nil && ![jsonFilePath isEqualToString:@""]) {
-    if (importRules) {
-      [self importJSONFile:jsonFilePath];
-    } else if (exportRules) {
-      [self exportJSONFile:jsonFilePath];
-    }
-    return;
-  }
-
   if (path) {
     SNTFileInfo *fi = [[SNTFileInfo alloc] initWithPath:path];
     if (!fi.path) {
@@ -245,6 +236,16 @@ - (void)runWithArguments:(NSArray *)arguments {
     return [self printStateOfRule:newRule daemonConnection:self.daemonConn];
   }
 
+  // Note this block needs to come after the check block above.
+  if (jsonFilePath.length > 0) {
+    if (importRules) {
+      [self importJSONFile:jsonFilePath];
+    } else if (exportRules) {
+      [self exportJSONFile:jsonFilePath];
+    }
+    return;
+  }
+
   if (newRule.state == SNTRuleStateUnknown) {
     [self printErrorUsageAndExit:@"No state specified"];
   } else if (!newRule.identifier) {