Fix issue where on-demand cleanup wasn't happening. Added cleanup of …

…the cleanup trigger to the cleanup logic (yo dawg) Also tidied up some of the SwiftLint stuff and moved disabled rules to the `.swiftlint.yml` file
macadmins · Aug 30, 2023 · 9ebcd3b · 9ebcd3b
1 parent 403a949
commit 9ebcd3b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,2 +1,8 @@
+disabled_rules: # rule identifiers turned on by default to exclude from running
+  - line_length
+  - function_body_length
+  - cyclomatic_complexity
+  - large_tuple
+
 excluded: # paths to ignore during linting. Takes precedence over `included`.
   - ./build/SourcePackages/checkouts/swift-argument-parser/*
diff --git a/Outset.xcodeproj/project.pbxproj b/Outset.xcodeproj/project.pbxproj
@@ -468,7 +468,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.1;
+				MARKETING_VERSION = 4.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = io.macadmins.Outset;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -505,7 +505,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.1;
+				MARKETING_VERSION = 4.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = io.macadmins.Outset;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Outset/Functions/FileUtils.swift b/Outset/Functions/FileUtils.swift
@@ -4,7 +4,6 @@
 //
 //  Created by Bart Reardon on 3/12/2022.
 //
-// swiftlint:disable large_tuple line_length function_body_length
 
 import Foundation
 import CommonCrypto

diff --git a/Outset/Functions/Processing.swift b/Outset/Functions/Processing.swift
@@ -4,7 +4,6 @@
 //
 //  Created by Bart Reardon on 3/12/2022.
 //
-// swiftlint:disable function_body_length cyclomatic_complexity
 
 import Foundation
 

diff --git a/Outset/Functions/Services.swift b/Outset/Functions/Services.swift
@@ -4,7 +4,6 @@
 //
 //  Created by Bart Reardon on 21/3/2023.
 //
-// swiftlint:disable line_length
 
 import Foundation
 import ServiceManagement

diff --git a/Outset/Functions/SystemUtils.swift b/Outset/Functions/SystemUtils.swift
@@ -4,7 +4,6 @@
 //
 //  Created by Bart Reardon on 1/12/2022.
 //
-// swiftlint:disable line_length
 
 import Foundation
 import SystemConfiguration

diff --git a/Outset/Outset.swift b/Outset/Outset.swift
@@ -6,7 +6,6 @@
 //
 // swift implementation of outset by Joseph Chilcote https://github.com/chilcote/outset
 //
-// swiftlint:disable line_length function_body_length cyclomatic_complexity
 
 import Foundation
 import ArgumentParser
@@ -249,12 +248,9 @@ struct Outset: ParsableCommand {
 
         if cleanup {
             writeLog("Cleaning up on-demand directory.", logLevel: .debug)
-            if checkFileExists(path: onDemandTrigger) {
-                    pathCleanup(pathname: onDemandTrigger)
-            }
-            if !folderContents(path: onDemandDir).isEmpty {
-                pathCleanup(pathname: onDemandDir)
-            }
+            if checkFileExists(path: onDemandTrigger) { pathCleanup(pathname: onDemandTrigger) }
+            if checkFileExists(path: cleanupTrigger) { pathCleanup(pathname: cleanupTrigger) }
+            if !folderContents(path: onDemandDir).isEmpty { pathCleanup(pathname: onDemandDir) }
         }
 
         if !addIgnoredUser.isEmpty {