From e1d49b5eb077550b686fed73ac9ea4fba3c95741 Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@csiro.au>
Date: Tue, 1 Aug 2023 15:53:49 +1000
Subject: [PATCH 01/11] Updated README.md with current info. Also moved some
 content around and linked classic outset to the copy contained in this repo

---
 README.md | 83 ++++++++++++++++++++++---------------------------------
 1 file changed, 33 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index b9d77c4..845c3dc 100644
--- a/README.md
+++ b/README.md
@@ -5,75 +5,58 @@ Outset
 
 Outset is a utility application which automatically processes scripts and packages during the boot sequence, user logins, or on demand.
 
-Requirements
-------------
-+ macOS 10.15+
-
-Legacy python version can be found here: https://github.com/chilcote/outset/
+[Check out the wiki](https://github.com/macadmins/outset/wiki) for more information on how to use Outset or find out [how it works](https://github.com/chilcote/outset/wiki/FAQ).
 
-Usage
------
-
-	OVERVIEW: This script automatically processes packages, profiles, and/or scripts at boot, on demand, and/or login.
+## Requirements
++ macOS 10.15+
 
-	USAGE: outset <options>
+## Usage
 
 	OPTIONS:
-	--boot                  Used by launchd for scheduled runs at boot
-	--login                 Used by launchd for scheduled runs at login
-	--login-privileged      Used by launchd for scheduled privileged runs at login
-	--on-demand             Process scripts on demand
-	--login-every           Manually process scripts in login-every
-	--login-once            Manually process scripts in login-once
-	--cleanup               Used by launchd to clean up on-demand dir
-	--add-ignored-user <username>
-							Add one or more users to ignored list
-	--remove-ignored-user <username>
-							Remove one or more users from ignored list
-	--add-overide <script>  Add one or more scripts to override list
-	--remove-overide <script>
-							Remove one or more scripts from override list
-	--compute-sha <file>    Compute the SHA1 hash of the given file
-	--version               Show version number
-	-h, --help              Show help information.
-
-
-
-See the [wiki](https://github.com/macadmins/outset/wiki) for info on how to use Outset.
-
-Credits
--------
-The swift port of Outset is a direct feature for feature (almost) replacement for the python version of Outset by Joseph Chilcote.
-
-### What Isn't ported
+		--boot                  Used by launchd for scheduled runs at boot
+		--login                 Used by launchd for scheduled runs at login
+		--login-window          Used by launchd for scheduled runs at the login window
+		--login-privileged      Used by launchd for scheduled privileged runs at login
+		--on-demand             Process scripts on demand
+		--login-every           Manually process scripts in login-every
+		--login-once            Manually process scripts in login-once
+		--cleanup               Used by launchd to clean up on-demand dir
+		--add-ignored-user <username>
+								Add one or more users to ignored list
+		--remove-ignored-user <username>
+								Remove one or more users from ignored list
+		--add-override <script> Add one or more scripts to override list
+		--remove-override <script>
+								Remove one or more scripts from override list
+		--checksum <file>       Compute the checksum (SHA256) hash of the given file. Use the keyword 'all' to compute all
+								values and generate a formatted configuration plist
+		--version               Show version number
+		-h, --help              Show help information.
 
-Recent version of macos restrict the installation of `.mobileconfig` files in a useful way outside of MDM and from macOS 11 Big Sur onwards, the `profiles` command can no longer be used to install configuration profiles, so makes no sense to continue support for this feature.
 
-Future releases may also remove the capability to install packages as this also is something that is better served from your MDM or other application management toolkit.
+## Credits
 
-### What's installed
+The Outset 4 is a direct feature for feature (almost) update of outset by [Joseph Chilcote](https://github.com/chilcote) written in Swift.
 
-Appart from the `Outset` app, the pkg also includes some other files:
+Maintained by [MacAdmins Open Source](https://macadmins.io) and [Bart Reardon](https://github.com/bartreardon) 
 
-#### Agents
-`/Library/LaunchDaemons/` `/Library/LaunchAgents/`
 
-Updated with the `AssociatedBundleIdentifiers` key so under macOS 13, Login Items show everything under the 'Outset' title
+### Feature Support
 
-#### Outset.app
+Recent version of macos restrict the installation of `.mobileconfig` files in a useful way outside of MDM and from macOS 11 Big Sur onwards, the `profiles` command can no longer be used to install configuration profiles, so makes no sense to continue support for this feature.
 
-![Outset Icon](https://github.com/bartreardon/outset/blob/master/outset/Assets.xcassets/AppIcon.appiconset/Outset.png_32x32@2x.png?raw=true) 
+Future releases may also remove the capability to install packages as this also is something that is better served from your MDM or other application management toolkit.
 
-`/usr/local/outset/Outset.app`
+#### Classic Outset
+Classic outset is available if required [as a legacy release](https://github.com/macadmins/outset/tree/main/legacy)
 
-Apart from being an app bundle, this app has the BundleID of `io.macadmins.Outset` which is used to show in macOS 13 Login Items under the same app bundle and with an icon. 
+_Note: Classic outset, while available in this repository, is no longer maintained and there are no plans for any future updates_ 
 
 ## Building the project
 
 Add your developer certificate in the signing and capabilities of the "Outset App Bundle" build targets in Xcode. Select the "Outset Installer Package" scheme and build. This should generate an `Outset.pkg` in your `Build/Products/Release` directory.
 
-License
--------
+## License
 
        Copyright 2023 Mac Admins Open Source
 

From 403a949448b8060c3f110844e835adc72b80ecfd Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@csiro.au>
Date: Tue, 1 Aug 2023 15:56:12 +1000
Subject: [PATCH 02/11] Removed some typos

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 845c3dc..b35a504 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Outset is a utility application which automatically processes scripts and packag
 
 ## Credits
 
-The Outset 4 is a direct feature for feature (almost) update of outset by [Joseph Chilcote](https://github.com/chilcote) written in Swift.
+Outset 4 is a direct feature for feature (almost) update of outset by [Joseph Chilcote](https://github.com/chilcote) written in Swift.
 
 Maintained by [MacAdmins Open Source](https://macadmins.io) and [Bart Reardon](https://github.com/bartreardon) 
 

From 9ebcd3be35bc231e91677c406781521ea782b35b Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Wed, 30 Aug 2023 22:26:55 +1000
Subject: [PATCH 03/11] 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

---
 .swiftlint.yml                     |  6 ++++++
 Outset.xcodeproj/project.pbxproj   |  4 ++--
 Outset/Functions/FileUtils.swift   |  1 -
 Outset/Functions/Processing.swift  |  1 -
 Outset/Functions/Services.swift    |  1 -
 Outset/Functions/SystemUtils.swift |  1 -
 Outset/Outset.swift                | 10 +++-------
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index ec8a366..47de516 100644
--- 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
index 5317038..348d582 100644
--- 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
index ca57862..72c5dee 100644
--- 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
index b1d817b..a9646d3 100644
--- 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
index fa36c7f..2d75b14 100644
--- 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
index 324ca3b..3c6191d 100644
--- 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
index 02e5725..65b53cd 100644
--- 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 {

From e5197fa66ceeffbe2478f6b99c0336b86bfe86ec Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Wed, 30 Aug 2023 23:18:53 +1000
Subject: [PATCH 04/11] use marketing version instead of static version in
 info.plist

---
 Outset/Info.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Outset/Info.plist b/Outset/Info.plist
index 501ac25..a4dd972 100644
--- a/Outset/Info.plist
+++ b/Outset/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>4.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

From 140167e434ae0bf5b19b89b3a1deac690fbf00c9 Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Wed, 30 Aug 2023 23:37:56 +1000
Subject: [PATCH 05/11] ugh

---
 Outset/Info.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Outset/Info.plist b/Outset/Info.plist
index a4dd972..211f008 100644
--- a/Outset/Info.plist
+++ b/Outset/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>4.0.5</string>
 	<key>CFBundleVersion</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>4.0.5</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

From 101dab38b643a66e7e49aba3e6952c38919b8608 Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Wed, 30 Aug 2023 23:32:02 +1000
Subject: [PATCH 06/11] keeping the linter happy

---
 .swiftlint.yml                     | 3 +++
 Outset/Functions/FileUtils.swift   | 2 --
 Outset/Functions/Processing.swift  | 2 --
 Outset/Functions/Services.swift    | 2 --
 Outset/Functions/SystemUtils.swift | 2 --
 Outset/Outset.swift                | 2 --
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 47de516..19af90a 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -1,8 +1,11 @@
 disabled_rules: # rule identifiers turned on by default to exclude from running
   - line_length
+  - file_length
   - function_body_length
   - cyclomatic_complexity
   - large_tuple
+  - force_cast
+
 
 excluded: # paths to ignore during linting. Takes precedence over `included`.
   - ./build/SourcePackages/checkouts/swift-argument-parser/*
diff --git a/Outset/Functions/FileUtils.swift b/Outset/Functions/FileUtils.swift
index 0cefc8d..2a57ccf 100644
--- a/Outset/Functions/FileUtils.swift
+++ b/Outset/Functions/FileUtils.swift
@@ -409,5 +409,3 @@ extension URL {
        (try? resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == true
     }
 }
-
-// swiftlint:enable large_tuple line_length force_cast file_length cyclomatic_complexity function_body_length
diff --git a/Outset/Functions/Processing.swift b/Outset/Functions/Processing.swift
index 8b38883..d31791e 100644
--- a/Outset/Functions/Processing.swift
+++ b/Outset/Functions/Processing.swift
@@ -135,5 +135,3 @@ func processItems(_ path: String, deleteItems: Bool=false, once: Bool=false, ove
     }
 
 }
-
-// swiftlint:enable function_body_length cyclomatic_complexity
diff --git a/Outset/Functions/Services.swift b/Outset/Functions/Services.swift
index be5dd7b..2d75b14 100644
--- a/Outset/Functions/Services.swift
+++ b/Outset/Functions/Services.swift
@@ -125,5 +125,3 @@ class ServiceManager {
         status(loginWindowAgent)
     }
 }
-
-// swiftlint:enable line_length
diff --git a/Outset/Functions/SystemUtils.swift b/Outset/Functions/SystemUtils.swift
index 02fda45..6d48a58 100644
--- a/Outset/Functions/SystemUtils.swift
+++ b/Outset/Functions/SystemUtils.swift
@@ -359,5 +359,3 @@ func writeSysReport() {
     writeLog("OS: \(getOSVersion())", logLevel: .debug)
     writeLog("Build: \(getOSBuildVersion())", logLevel: .debug)
 }
-
-// swiftlint:enable line_length
diff --git a/Outset/Outset.swift b/Outset/Outset.swift
index cd86764..14c136a 100644
--- a/Outset/Outset.swift
+++ b/Outset/Outset.swift
@@ -346,5 +346,3 @@ struct Outset: ParsableCommand {
         }
     }
 }
-
-// swiftlint:enable line_length function_body_length cyclomatic_complexity

From 1cdcbbcb38adf85dea31b395a9276c6e4865ed3f Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Tue, 5 Sep 2023 17:39:41 +1000
Subject: [PATCH 07/11] Moved things around so relevant components are easier
 to locate Some minor function renaming

---
 Outset.xcodeproj/project.pbxproj              |  52 ++-
 Outset/Extensions/Data+additions.swift        |  24 ++
 Outset/Extensions/String+additions.swift      |  21 ++
 Outset/Extensions/URL+additions.swift         |  14 +
 Outset/Functions/Checksum.swift               | 100 ++++++
 Outset/Functions/FileUtils.swift              | 217 ------------
 ...{Processing.swift => ItemProcessing.swift} |   4 +-
 Outset/Functions/Logging.swift                |  74 +++++
 Outset/Functions/Network.swift                |  53 +++
 Outset/Functions/Preferences.swift            | 206 ++++++++++++
 Outset/Functions/ShellUtils.swift             |  50 +++
 Outset/Functions/SystemInfo.swift             |  58 ++++
 Outset/Functions/SystemUtils.swift            | 310 ------------------
 Outset/Outset.swift                           |  12 +-
 14 files changed, 656 insertions(+), 539 deletions(-)
 create mode 100644 Outset/Extensions/Data+additions.swift
 create mode 100644 Outset/Extensions/String+additions.swift
 create mode 100644 Outset/Extensions/URL+additions.swift
 create mode 100644 Outset/Functions/Checksum.swift
 rename Outset/Functions/{Processing.swift => ItemProcessing.swift} (98%)
 create mode 100644 Outset/Functions/Logging.swift
 create mode 100644 Outset/Functions/Network.swift
 create mode 100644 Outset/Functions/Preferences.swift
 create mode 100644 Outset/Functions/ShellUtils.swift
 create mode 100644 Outset/Functions/SystemInfo.swift

diff --git a/Outset.xcodeproj/project.pbxproj b/Outset.xcodeproj/project.pbxproj
index 4d9c0b7..883691b 100644
--- a/Outset.xcodeproj/project.pbxproj
+++ b/Outset.xcodeproj/project.pbxproj
@@ -14,9 +14,18 @@
 		41765ACA29C97B6400D616BF /* Services.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41765AC929C97B6400D616BF /* Services.swift */; };
 		41E28EA229ACDCD6002ADBE5 /* Outset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4124EF90293822F4003B00F4 /* Outset.swift */; };
 		41E28EA329ACDCE3002ADBE5 /* FileUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4124EFA2293B2F9B003B00F4 /* FileUtils.swift */; };
-		41E28EA429ACDCE3002ADBE5 /* Processing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4124EFA4293B304B003B00F4 /* Processing.swift */; };
+		41E28EA429ACDCE3002ADBE5 /* ItemProcessing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4124EFA4293B304B003B00F4 /* ItemProcessing.swift */; };
 		41E28EA529ACDCE3002ADBE5 /* SystemUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4124EF99293824C8003B00F4 /* SystemUtils.swift */; };
 		41E28EA729ACDD1F002ADBE5 /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 41E28EA629ACDD1F002ADBE5 /* ArgumentParser */; };
+		CC3DC8222AA70B2D0050EE16 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC8212AA70B2D0050EE16 /* Logging.swift */; };
+		CC3DC8242AA70BD40050EE16 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC8232AA70BD40050EE16 /* Preferences.swift */; };
+		CC3DC8262AA70D2D0050EE16 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC8252AA70D2D0050EE16 /* Network.swift */; };
+		CC3DC8282AA70D930050EE16 /* SystemInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC8272AA70D930050EE16 /* SystemInfo.swift */; };
+		CC3DC82A2AA70E380050EE16 /* Checksum.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC8292AA70E380050EE16 /* Checksum.swift */; };
+		CC3DC82D2AA70EE60050EE16 /* Data+additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC82C2AA70EE60050EE16 /* Data+additions.swift */; };
+		CC3DC82F2AA70F230050EE16 /* URL+additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC82E2AA70F230050EE16 /* URL+additions.swift */; };
+		CC3DC8312AA70F790050EE16 /* String+additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC8302AA70F790050EE16 /* String+additions.swift */; };
+		CC3DC8332AA7100C0050EE16 /* ShellUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3DC8322AA7100C0050EE16 /* ShellUtils.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -56,7 +65,7 @@
 		4124EF90293822F4003B00F4 /* Outset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Outset.swift; sourceTree = "<group>"; };
 		4124EF99293824C8003B00F4 /* SystemUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemUtils.swift; sourceTree = "<group>"; };
 		4124EFA2293B2F9B003B00F4 /* FileUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = "<group>"; };
-		4124EFA4293B304B003B00F4 /* Processing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Processing.swift; sourceTree = "<group>"; };
+		4124EFA4293B304B003B00F4 /* ItemProcessing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemProcessing.swift; sourceTree = "<group>"; };
 		4124EFAD29414A5D003B00F4 /* Outset.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Outset.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4124EFB329414A5E003B00F4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		4124EFB629414A5E003B00F4 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -72,6 +81,15 @@
 		41A67A13296BF35F000BFFCE /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		41ADC47C29AECB8B00C5B94C /* outset */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = outset; sourceTree = "<group>"; };
 		41ADC47E29AF649C00C5B94C /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
+		CC3DC8212AA70B2D0050EE16 /* Logging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = "<group>"; };
+		CC3DC8232AA70BD40050EE16 /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
+		CC3DC8252AA70D2D0050EE16 /* Network.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
+		CC3DC8272AA70D930050EE16 /* SystemInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemInfo.swift; sourceTree = "<group>"; };
+		CC3DC8292AA70E380050EE16 /* Checksum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checksum.swift; sourceTree = "<group>"; };
+		CC3DC82C2AA70EE60050EE16 /* Data+additions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+additions.swift"; sourceTree = "<group>"; };
+		CC3DC82E2AA70F230050EE16 /* URL+additions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+additions.swift"; sourceTree = "<group>"; };
+		CC3DC8302AA70F790050EE16 /* String+additions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+additions.swift"; sourceTree = "<group>"; };
+		CC3DC8322AA7100C0050EE16 /* ShellUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShellUtils.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -111,9 +129,15 @@
 			isa = PBXGroup;
 			children = (
 				4124EFA2293B2F9B003B00F4 /* FileUtils.swift */,
-				4124EFA4293B304B003B00F4 /* Processing.swift */,
+				4124EFA4293B304B003B00F4 /* ItemProcessing.swift */,
 				4124EF99293824C8003B00F4 /* SystemUtils.swift */,
 				41765AC929C97B6400D616BF /* Services.swift */,
+				CC3DC8212AA70B2D0050EE16 /* Logging.swift */,
+				CC3DC8232AA70BD40050EE16 /* Preferences.swift */,
+				CC3DC8252AA70D2D0050EE16 /* Network.swift */,
+				CC3DC8272AA70D930050EE16 /* SystemInfo.swift */,
+				CC3DC8292AA70E380050EE16 /* Checksum.swift */,
+				CC3DC8322AA7100C0050EE16 /* ShellUtils.swift */,
 			);
 			path = Functions;
 			sourceTree = "<group>";
@@ -122,6 +146,7 @@
 			isa = PBXGroup;
 			children = (
 				4124EF90293822F4003B00F4 /* Outset.swift */,
+				CC3DC82B2AA70EC90050EE16 /* Extensions */,
 				4124EFA6293B30D6003B00F4 /* Functions */,
 				4124EFC329414DA4003B00F4 /* Info.plist */,
 				4124EFB329414A5E003B00F4 /* Assets.xcassets */,
@@ -167,6 +192,16 @@
 			path = Scripts;
 			sourceTree = "<group>";
 		};
+		CC3DC82B2AA70EC90050EE16 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				CC3DC82C2AA70EE60050EE16 /* Data+additions.swift */,
+				CC3DC82E2AA70F230050EE16 /* URL+additions.swift */,
+				CC3DC8302AA70F790050EE16 /* String+additions.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -308,8 +343,17 @@
 			buildActionMask = 2147483647;
 			files = (
 				41765ACA29C97B6400D616BF /* Services.swift in Sources */,
+				CC3DC8282AA70D930050EE16 /* SystemInfo.swift in Sources */,
+				CC3DC8242AA70BD40050EE16 /* Preferences.swift in Sources */,
+				CC3DC82F2AA70F230050EE16 /* URL+additions.swift in Sources */,
+				CC3DC8262AA70D2D0050EE16 /* Network.swift in Sources */,
+				CC3DC8222AA70B2D0050EE16 /* Logging.swift in Sources */,
 				41E28EA329ACDCE3002ADBE5 /* FileUtils.swift in Sources */,
-				41E28EA429ACDCE3002ADBE5 /* Processing.swift in Sources */,
+				CC3DC82D2AA70EE60050EE16 /* Data+additions.swift in Sources */,
+				CC3DC8332AA7100C0050EE16 /* ShellUtils.swift in Sources */,
+				CC3DC82A2AA70E380050EE16 /* Checksum.swift in Sources */,
+				CC3DC8312AA70F790050EE16 /* String+additions.swift in Sources */,
+				41E28EA429ACDCE3002ADBE5 /* ItemProcessing.swift in Sources */,
 				41E28EA529ACDCE3002ADBE5 /* SystemUtils.swift in Sources */,
 				41E28EA229ACDCD6002ADBE5 /* Outset.swift in Sources */,
 			);
diff --git a/Outset/Extensions/Data+additions.swift b/Outset/Extensions/Data+additions.swift
new file mode 100644
index 0000000..257eda6
--- /dev/null
+++ b/Outset/Extensions/Data+additions.swift
@@ -0,0 +1,24 @@
+//
+//  Data+additions.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+import CommonCrypto
+
+extension Data {
+    // extension to the Data class that lets us compute sha256
+    func sha256() -> Data {
+        var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
+        self.withUnsafeBytes {
+            _ = CC_SHA256($0.baseAddress, CC_LONG(count), &hash)
+        }
+        return Data(hash)
+    }
+
+    func hexEncodedString() -> String {
+        return map { String(format: "%02hhx", $0) }.joined()
+    }
+}
diff --git a/Outset/Extensions/String+additions.swift b/Outset/Extensions/String+additions.swift
new file mode 100644
index 0000000..1dd3262
--- /dev/null
+++ b/Outset/Extensions/String+additions.swift
@@ -0,0 +1,21 @@
+//
+//  String+additions.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+
+extension String {
+    func camelCaseToUnderscored() -> String {
+        let regex = try? NSRegularExpression(pattern: "([a-z])([A-Z])", options: [])
+        let range = NSRange(location: 0, length: utf16.count)
+        return regex?.stringByReplacingMatches(in: self, options: [], range: range, withTemplate: "$1_$2").lowercased() ?? self
+    }
+}
+
+func getValueForKey(_ key: String, inArray array: [String: String]) -> String? {
+    // short function that treats a [String: String] as a key value pair.
+    return array[key]
+}
diff --git a/Outset/Extensions/URL+additions.swift b/Outset/Extensions/URL+additions.swift
new file mode 100644
index 0000000..8d4c180
--- /dev/null
+++ b/Outset/Extensions/URL+additions.swift
@@ -0,0 +1,14 @@
+//
+//  URL+additions.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+
+extension URL {
+    var isDirectory: Bool {
+       (try? resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == true
+    }
+}
diff --git a/Outset/Functions/Checksum.swift b/Outset/Functions/Checksum.swift
new file mode 100644
index 0000000..e5a66df
--- /dev/null
+++ b/Outset/Functions/Checksum.swift
@@ -0,0 +1,100 @@
+//
+//  Checksum.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+
+struct FileHashes: Codable {
+    var sha256sum: [String: String] = [String: String]()
+}
+
+func checksumLoadApprovedFiles() -> [String: String] {
+    // imports the list of file hashes that are approved to run
+    var outsetFileHashList = FileHashes()
+
+    let defaults = UserDefaults.standard
+    let hashes = defaults.object(forKey: "sha256sum")
+
+    if let data = hashes as? [String: String] {
+        for (key, value) in data {
+            outsetFileHashList.sha256sum[key] = value
+        }
+    }
+
+    return outsetFileHashList.sha256sum
+}
+
+func verifySHASUMForFile(filename: String, shasumArray: [String: String]) -> Bool {
+    // Verify that the file
+    var proceed = false
+        let errorMessage = "no required hash or file hash mismatch for: \(filename). Skipping"
+        writeLog("checking hash for \(filename)", logLevel: .debug)
+        let url = URL(fileURLWithPath: filename)
+        if let fileHash = sha256(for: url) {
+            writeLog("file hash : \(fileHash)", logLevel: .debug)
+            if let storedHash = getValueForKey(filename, inArray: shasumArray) {
+                writeLog("required hash : \(storedHash)", logLevel: .debug)
+                if storedHash == fileHash {
+                    proceed = true
+                }
+            }
+        }
+        if !proceed {
+            writeLog(errorMessage, logLevel: .error)
+        }
+
+        return proceed
+}
+
+func sha256(for url: URL) -> String? {
+    // computes a sha256sum for the specified file path and returns a string
+    do {
+        let fileData = try Data(contentsOf: url)
+        let sha256 = fileData.sha256()
+        return sha256.hexEncodedString()
+    } catch {
+        return nil
+    }
+}
+
+func checksumAllFiles() {
+    // compute checksum (SHA256) for all files in the outset directory
+    // returns data in two formats to stdout:
+    //   plaintext
+    //   as plist format ready for import into an MDM or converting to a .mobileconfig
+
+    let url = URL(fileURLWithPath: outsetDirectory)
+    writeLog("CHECKSUM", logLevel: .info)
+    var shasumPlist = FileHashes()
+    if let enumerator = FileManager.default.enumerator(at: url, includingPropertiesForKeys: [.isRegularFileKey], options: [.skipsHiddenFiles, .skipsPackageDescendants]) {
+        for case let fileURL as URL in enumerator {
+            do {
+                let fileAttributes = try fileURL.resourceValues(forKeys: [.isRegularFileKey])
+                if fileAttributes.isRegularFile! && fileURL.pathExtension != "plist" && fileURL.lastPathComponent != "outset" {
+                    if let shasum = sha256(for: fileURL) {
+                        print("\(fileURL.relativePath) : \(shasum)")
+                        shasumPlist.sha256sum[fileURL.relativePath] = shasum
+                    }
+                }
+            } catch { print(error, fileURL) }
+        }
+
+        writeLog("PLIST", logLevel: .info)
+        let encoder = PropertyListEncoder()
+        encoder.outputFormat = .xml
+        do {
+            let data = try encoder.encode(shasumPlist)
+            if let plist = try PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] {
+                let formatted = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
+                if let string = String(data: formatted, encoding: .utf8) {
+                    print(string)
+                }
+            }
+        } catch {
+            writeLog("plist encoding failed", logLevel: .error)
+        }
+    }
+}
diff --git a/Outset/Functions/FileUtils.swift b/Outset/Functions/FileUtils.swift
index 2a57ccf..7310fe6 100644
--- a/Outset/Functions/FileUtils.swift
+++ b/Outset/Functions/FileUtils.swift
@@ -6,49 +6,6 @@
 //
 
 import Foundation
-import CommonCrypto
-
-func runShellCommand(_ command: String, args: [String] = [], verbose: Bool = false) -> (output: String, error: String, exitCode: Int32) {
-    // runs a shell command passed as an argument
-    // If the verbose parameter is set to true, will log the command being run and its status when completed.
-    // returns the output, error and exit code as a tuple.
-
-    if verbose {
-        writeLog("Running task \(command)", logLevel: .debug)
-    }
-    let task = Process()
-    let pipe = Pipe()
-    let errorpipe = Pipe()
-
-    var cmd = command
-    for arg in args {
-        cmd += " '\(arg)'"
-    }
-    let arguments = ["-c", cmd]
-
-    var output: String = ""
-    var error: String = ""
-
-    task.launchPath = "/bin/sh"
-    task.arguments = arguments
-    task.standardOutput = pipe
-    task.standardError = errorpipe
-    task.launch()
-
-    let data = pipe.fileHandleForReading.readDataToEndOfFile()
-    let errordata = errorpipe.fileHandleForReading.readDataToEndOfFile()
-
-    output.append(String(data: data, encoding: .utf8)!)
-    error.append(String(data: errordata, encoding: .utf8)!)
-
-    task.waitUntilExit()
-    let status = task.terminationStatus
-    if verbose {
-        writeLog("Completed task \(command) with status \(status)", logLevel: .debug)
-        writeLog("Task output: \n\(output)", logLevel: .debug)
-    }
-    return (output, error, status)
-}
 
 func installPackage(pkg: String) -> Bool {
     // Installs pkg onto boot drive
@@ -110,87 +67,6 @@ func ensureWorkingFolders() {
     }
 }
 
-func migrateLegacyPreferences() {
-    let newoldRootUserDefaults = "/var/root/Library/Preferences/io.macadmins.Outset.plist"
-    // shared folder should not contain any executable content, iterate and update as required
-    if checkFileExists(path: shareDirectory) || checkFileExists(path: newoldRootUserDefaults) {
-        writeLog("Legacy preferences exist. Migrating to user defaults", logLevel: .debug)
-
-        let legacyOutsetPreferencesFile = "\(shareDirectory)com.chilcote.outset.plist"
-        let legacyRootRunOncePlistFile = "com.github.outset.once.\(getConsoleUserInfo().userID).plist"
-        let userHomeDirectory = FileManager.default.homeDirectoryForCurrentUser
-        let userHomePath = userHomeDirectory.relativeString.replacingOccurrences(of: "file://", with: "")
-        let legacyUserRunOncePlistFile = userHomePath+"Library/Preferences/com.github.outset.once.plist"
-
-        var shareFiles: [String] = []
-        shareFiles.append(legacyOutsetPreferencesFile)
-        shareFiles.append(legacyRootRunOncePlistFile)
-        shareFiles.append(legacyUserRunOncePlistFile)
-        shareFiles.append(newoldRootUserDefaults)
-
-        for filename in shareFiles where checkFileExists(path: filename) {
-
-            let url = URL(fileURLWithPath: filename)
-            do {
-                let data = try Data(contentsOf: url)
-                switch filename {
-
-                case newoldRootUserDefaults:
-                    if isRoot() {
-                        writeLog("\(newoldRootUserDefaults) migration", logLevel: .debug)
-                        let legacyDefaultKeys = CFPreferencesCopyKeyList(Bundle.main.bundleIdentifier! as CFString, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)
-                        for key in legacyDefaultKeys as! [CFString] {
-                            let keyValue = CFPreferencesCopyValue(key, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)
-                            CFPreferencesSetValue(key as CFString,
-                                                  keyValue as CFPropertyList,
-                                                  Bundle.main.bundleIdentifier! as CFString,
-                                                  kCFPreferencesAnyUser,
-                                                  kCFPreferencesAnyHost)
-                        }
-                        deletePath(newoldRootUserDefaults)
-                    }
-                case legacyOutsetPreferencesFile:
-                    writeLog("\(legacyOutsetPreferencesFile) migration", logLevel: .debug)
-                    do {
-                        let legacyPreferences = try PropertyListDecoder().decode(OutsetPreferences.self, from: data)
-                        writePreferences(prefs: legacyPreferences)
-                        writeLog("Migrated Legacy Outset Preferences", logLevel: .debug)
-                        deletePath(legacyOutsetPreferencesFile)
-                    } catch {
-                        writeLog("legacy Preferences migration failed", logLevel: .error)
-                    }
-
-                case legacyRootRunOncePlistFile, legacyUserRunOncePlistFile:
-                    writeLog("\(legacyRootRunOncePlistFile) and \(legacyUserRunOncePlistFile) migration", logLevel: .debug)
-                    do {
-                        let legacyRunOncePlistData = try PropertyListDecoder().decode([String: Date].self, from: data)
-                        writeRunOnce(runOnceData: legacyRunOncePlistData)
-                        writeLog("Migrated Legacy Runonce Data", logLevel: .debug)
-                        if isRoot() {
-                            deletePath(legacyRootRunOncePlistFile)
-                        } else {
-                            deletePath(legacyUserRunOncePlistFile)
-                        }
-                    } catch {
-                        writeLog("legacy Run Once Plist migration failed", logLevel: .error)
-                    }
-
-                default:
-                    continue
-                }
-            } catch {
-                writeLog("could not load \(filename)", logLevel: .error)
-            }
-
-        }
-
-        if checkFileExists(path: shareDirectory) && folderContents(path: shareDirectory).isEmpty {
-            deletePath(shareDirectory)
-        }
-    }
-
-}
-
 func checkFileExists(path: String) -> Bool {
     return FileManager.default.fileExists(atPath: path)
 }
@@ -316,96 +192,3 @@ func detachDmg(dmgMount: String) -> String {
     }
     return output.trimmingCharacters(in: .whitespacesAndNewlines)
 }
-
-func verifySHASUMForFile(filename: String, shasumArray: [String: String]) -> Bool {
-    // Verify that the file
-    var proceed = false
-        let errorMessage = "no required hash or file hash mismatch for: \(filename). Skipping"
-        writeLog("checking hash for \(filename)", logLevel: .debug)
-        let url = URL(fileURLWithPath: filename)
-        if let fileHash = sha256(for: url) {
-            writeLog("file hash : \(fileHash)", logLevel: .debug)
-            if let storedHash = getValueForKey(filename, inArray: shasumArray) {
-                writeLog("required hash : \(storedHash)", logLevel: .debug)
-                if storedHash == fileHash {
-                    proceed = true
-                }
-            }
-        }
-        if !proceed {
-            writeLog(errorMessage, logLevel: .error)
-        }
-
-        return proceed
-}
-
-func sha256(for url: URL) -> String? {
-    // computes a sha256sum for the specified file path and returns a string
-    do {
-        let fileData = try Data(contentsOf: url)
-        let sha256 = fileData.sha256()
-        return sha256.hexEncodedString()
-    } catch {
-        return nil
-    }
-}
-
-func checksumAllFiles() {
-    // compute checksum (SHA256) for all files in the outset directory
-    // returns data in two formats to stdout:
-    //   plaintext
-    //   as plist format ready for import into an MDM or converting to a .mobileconfig
-
-    let url = URL(fileURLWithPath: outsetDirectory)
-    writeLog("CHECKSUM", logLevel: .info)
-    var shasumPlist = FileHashes()
-    if let enumerator = FileManager.default.enumerator(at: url, includingPropertiesForKeys: [.isRegularFileKey], options: [.skipsHiddenFiles, .skipsPackageDescendants]) {
-        for case let fileURL as URL in enumerator {
-            do {
-                let fileAttributes = try fileURL.resourceValues(forKeys: [.isRegularFileKey])
-                if fileAttributes.isRegularFile! && fileURL.pathExtension != "plist" && fileURL.lastPathComponent != "outset" {
-                    if let shasum = sha256(for: fileURL) {
-                        print("\(fileURL.relativePath) : \(shasum)")
-                        shasumPlist.sha256sum[fileURL.relativePath] = shasum
-                    }
-                }
-            } catch { print(error, fileURL) }
-        }
-
-        writeLog("PLIST", logLevel: .info)
-        let encoder = PropertyListEncoder()
-        encoder.outputFormat = .xml
-        do {
-            let data = try encoder.encode(shasumPlist)
-            if let plist = try PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] {
-                let formatted = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
-                if let string = String(data: formatted, encoding: .utf8) {
-                    print(string)
-                }
-            }
-        } catch {
-            writeLog("plist encoding failed", logLevel: .error)
-        }
-    }
-}
-
-extension Data {
-    // extension to the Data class that lets us compute sha256
-    func sha256() -> Data {
-        var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
-        self.withUnsafeBytes {
-            _ = CC_SHA256($0.baseAddress, CC_LONG(count), &hash)
-        }
-        return Data(hash)
-    }
-
-    func hexEncodedString() -> String {
-        return map { String(format: "%02hhx", $0) }.joined()
-    }
-}
-
-extension URL {
-    var isDirectory: Bool {
-       (try? resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == true
-    }
-}
diff --git a/Outset/Functions/Processing.swift b/Outset/Functions/ItemProcessing.swift
similarity index 98%
rename from Outset/Functions/Processing.swift
rename to Outset/Functions/ItemProcessing.swift
index d31791e..1d2979e 100644
--- a/Outset/Functions/Processing.swift
+++ b/Outset/Functions/ItemProcessing.swift
@@ -46,7 +46,7 @@ func processItems(_ path: String, deleteItems: Bool=false, once: Bool=false, ove
     }
 
     // load runonce data
-    runOnceDict = loadRunOnce()
+    runOnceDict = loadRunOncePlist()
 
     // loop through the packages list and process installs.
     for package in packages {
@@ -131,7 +131,7 @@ func processItems(_ path: String, deleteItems: Bool=false, once: Bool=false, ove
     }
 
     if !runOnceDict.isEmpty {
-        writeRunOnce(runOnceData: runOnceDict)
+        writeRunOncePlist(runOnceData: runOnceDict)
     }
 
 }
diff --git a/Outset/Functions/Logging.swift b/Outset/Functions/Logging.swift
new file mode 100644
index 0000000..662641a
--- /dev/null
+++ b/Outset/Functions/Logging.swift
@@ -0,0 +1,74 @@
+//
+//  Logging.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+import OSLog
+
+func oslogTypeToString(_ type: OSLogType) -> String {
+    switch type {
+    case OSLogType.default: return "default"
+    case OSLogType.info: return "info"
+    case OSLogType.debug: return "debug"
+    case OSLogType.error: return "error"
+    case OSLogType.fault: return "fault"
+    default: return "unknown"
+    }
+}
+
+func writeLog(_ message: String, logLevel: OSLogType = .info, log: OSLog = osLog) {
+    // write to the system logs
+    os_log("%{public}@", log: log, type: logLevel, message)
+    if logLevel == .error || logLevel == .info || (debugMode && logLevel == .debug) {
+        // print info, errors and debug to stdout
+        print("\(oslogTypeToString(logLevel).uppercased()): \(message)")
+    }
+    // also write to a log file for accessability of those that don't want to manage the system log
+    writeFileLog(message: message, logLevel: logLevel)
+}
+
+func writeFileLog(message: String, logLevel: OSLogType) {
+    if logLevel == .debug && !debugMode {
+        return
+    }
+    let logFileURL = URL(fileURLWithPath: logFile)
+    if !checkFileExists(path: logFile) {
+        FileManager.default.createFile(atPath: logFileURL.path, contents: nil, attributes: nil)
+        let attributes = [FileAttributeKey.posixPermissions: 0o666]
+        do {
+            try FileManager.default.setAttributes(attributes, ofItemAtPath: logFileURL.path)
+        } catch {
+            print("\(oslogTypeToString(.error).uppercased()): Unable to create log file at \(logFile)")
+            return
+        }
+    }
+    do {
+        let fileHandle = try FileHandle(forWritingTo: logFileURL)
+        defer { fileHandle.closeFile() }
+
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+
+        let date = dateFormatter.string(from: Date())
+        let logEntry = "\(date) \(oslogTypeToString(logLevel).uppercased()): \(message)\n"
+
+        fileHandle.seekToEndOfFile()
+        fileHandle.write(logEntry.data(using: .utf8)!)
+    } catch {
+        print("\(oslogTypeToString(.error).uppercased()): Unable to read log file at \(logFile)")
+        return
+    }
+}
+
+func writeSysReport() {
+    // Logs system information to log file
+    writeLog("User: \(getConsoleUserInfo())", logLevel: .debug)
+    writeLog("Model: \(getDeviceHardwareModel())", logLevel: .debug)
+    writeLog("Marketing Model: \(getMarketingModel())", logLevel: .debug)
+    writeLog("Serial: \(getDeviceSerialNumber())", logLevel: .debug)
+    writeLog("OS: \(getOSVersion())", logLevel: .debug)
+    writeLog("Build: \(getOSBuildVersion())", logLevel: .debug)
+}
diff --git a/Outset/Functions/Network.swift b/Outset/Functions/Network.swift
new file mode 100644
index 0000000..d134834
--- /dev/null
+++ b/Outset/Functions/Network.swift
@@ -0,0 +1,53 @@
+//
+//  Network.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+import SystemConfiguration
+
+func isNetworkUp() -> Bool {
+    // https://stackoverflow.com/a/39782859/17584669
+    // perform a check to see if the network is available.
+
+    var zeroAddress = sockaddr_in(sin_len: 0, sin_family: 0, sin_port: 0, sin_addr: in_addr(s_addr: 0), sin_zero: (0, 0, 0, 0, 0, 0, 0, 0))
+    zeroAddress.sin_len = UInt8(MemoryLayout.size(ofValue: zeroAddress))
+    zeroAddress.sin_family = sa_family_t(AF_INET)
+
+    let defaultRouteReachability = withUnsafePointer(to: &zeroAddress) {
+        $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {zeroSockAddress in
+            SCNetworkReachabilityCreateWithAddress(nil, zeroSockAddress)
+        }
+    }
+
+    var flags: SCNetworkReachabilityFlags = SCNetworkReachabilityFlags(rawValue: 0)
+    if SCNetworkReachabilityGetFlags(defaultRouteReachability!, &flags) == false {
+        return false
+    }
+
+    let isReachable = (flags.rawValue & UInt32(kSCNetworkFlagsReachable)) != 0
+    let needsConnection = (flags.rawValue & UInt32(kSCNetworkFlagsConnectionRequired)) != 0
+    let ret = (isReachable && !needsConnection)
+
+    return ret
+}
+
+func waitForNetworkUp(timeout: Double) -> Bool {
+    // used during --boot if "wait_for_network" prefrence is true
+    var networkUp = false
+    let deadline = DispatchTime.now() + timeout
+    while !networkUp && DispatchTime.now() < deadline {
+        writeLog("Waiting for network: \(timeout) seconds", logLevel: .debug)
+        networkUp = isNetworkUp()
+        if !networkUp {
+            writeLog("Waiting...", logLevel: .debug)
+            Thread.sleep(forTimeInterval: 1)
+        }
+    }
+    if !networkUp && DispatchTime.now() > deadline {
+        writeLog("No network connectivity detected after \(timeout) seconds", logLevel: .error)
+    }
+    return networkUp
+}
diff --git a/Outset/Functions/Preferences.swift b/Outset/Functions/Preferences.swift
new file mode 100644
index 0000000..a01b20e
--- /dev/null
+++ b/Outset/Functions/Preferences.swift
@@ -0,0 +1,206 @@
+//
+//  Preferences.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+
+struct OutsetPreferences: Codable {
+    var waitForNetwork: Bool = false
+    var networkTimeout: Int = 180
+    var ignoredUsers: [String] = []
+    var overrideLoginOnce: [String: Date] = [String: Date]()
+
+    enum CodingKeys: String, CodingKey {
+        case waitForNetwork = "wait_for_network"
+        case networkTimeout = "network_timeout"
+        case ignoredUsers = "ignored_users"
+        case overrideLoginOnce = "override_login_once"
+    }
+}
+
+func writeOutsetPreferences(prefs: OutsetPreferences) {
+
+    if debugMode {
+        showPrefrencePath("Stor")
+    }
+
+    let defaults = UserDefaults.standard
+
+    // Take the OutsetPreferences object and write it to UserDefaults
+    let mirror = Mirror(reflecting: prefs)
+    for child in mirror.children {
+        // Use the name of each property as the key, and save its value to UserDefaults
+        if let propertyName = child.label {
+            let key = propertyName.camelCaseToUnderscored()
+            if isRoot() {
+                // write the preference to /Library/Preferences/
+                CFPreferencesSetValue(key as CFString,
+                                      child.value as CFPropertyList,
+                                      Bundle.main.bundleIdentifier! as CFString,
+                                      kCFPreferencesAnyUser,
+                                      kCFPreferencesAnyHost)
+            } else {
+                // write the preference to ~/Library/Preferences/
+                defaults.set(child.value, forKey: key)
+            }
+        }
+    }
+}
+
+func loadOutsetPreferences() -> OutsetPreferences {
+
+    if debugMode {
+        showPrefrencePath("Load")
+    }
+
+    let defaults = UserDefaults.standard
+    var outsetPrefs = OutsetPreferences()
+
+    if isRoot() {
+        // force preferences to be read from /Library/Preferences instead of root's preferences
+        outsetPrefs.networkTimeout = CFPreferencesCopyValue("network_timeout" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? Int ?? 180
+        outsetPrefs.ignoredUsers = CFPreferencesCopyValue("ignored_users" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? [String] ?? []
+        outsetPrefs.overrideLoginOnce = CFPreferencesCopyValue("override_login_once" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? [String: Date] ?? [:]
+        outsetPrefs.waitForNetwork = (CFPreferencesCopyValue("wait_for_network" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) != nil)
+    } else {
+        // load preferences for the current user, which includes /Library/Preferences
+        outsetPrefs.networkTimeout = defaults.integer(forKey: "network_timeout")
+        outsetPrefs.ignoredUsers = defaults.array(forKey: "ignored_users") as? [String] ?? []
+        outsetPrefs.overrideLoginOnce = defaults.object(forKey: "override_login_once") as? [String: Date] ?? [:]
+        outsetPrefs.waitForNetwork = defaults.bool(forKey: "wait_for_network")
+    }
+    return outsetPrefs
+}
+
+func loadRunOncePlist() -> [String: Date] {
+
+    if debugMode {
+        showPrefrencePath("Load")
+    }
+
+    let defaults = UserDefaults.standard
+    var runOnceKey = "run_once"
+
+    if isRoot() {
+        runOnceKey += "-"+getConsoleUserInfo().username
+        return CFPreferencesCopyValue(runOnceKey as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? [String: Date] ?? [:]
+    } else {
+        return defaults.object(forKey: runOnceKey) as? [String: Date] ?? [:]
+    }
+}
+
+func writeRunOncePlist(runOnceData: [String: Date]) {
+
+    if debugMode {
+        showPrefrencePath("Stor")
+    }
+
+    let defaults = UserDefaults.standard
+    var runOnceKey = "run_once"
+
+    if isRoot() {
+        runOnceKey += "-"+getConsoleUserInfo().username
+        CFPreferencesSetValue(runOnceKey as CFString,
+                              runOnceData as CFPropertyList,
+                              Bundle.main.bundleIdentifier! as CFString,
+                              kCFPreferencesAnyUser,
+                              kCFPreferencesAnyHost)
+    } else {
+        defaults.set(runOnceData, forKey: runOnceKey)
+    }
+}
+
+func migrateLegacyPreferences() {
+    let newoldRootUserDefaults = "/var/root/Library/Preferences/io.macadmins.Outset.plist"
+    // shared folder should not contain any executable content, iterate and update as required
+    if checkFileExists(path: shareDirectory) || checkFileExists(path: newoldRootUserDefaults) {
+        writeLog("Legacy preferences exist. Migrating to user defaults", logLevel: .debug)
+
+        let legacyOutsetPreferencesFile = "\(shareDirectory)com.chilcote.outset.plist"
+        let legacyRootRunOncePlistFile = "com.github.outset.once.\(getConsoleUserInfo().userID).plist"
+        let userHomeDirectory = FileManager.default.homeDirectoryForCurrentUser
+        let userHomePath = userHomeDirectory.relativeString.replacingOccurrences(of: "file://", with: "")
+        let legacyUserRunOncePlistFile = userHomePath+"Library/Preferences/com.github.outset.once.plist"
+
+        var shareFiles: [String] = []
+        shareFiles.append(legacyOutsetPreferencesFile)
+        shareFiles.append(legacyRootRunOncePlistFile)
+        shareFiles.append(legacyUserRunOncePlistFile)
+        shareFiles.append(newoldRootUserDefaults)
+
+        for filename in shareFiles where checkFileExists(path: filename) {
+
+            let url = URL(fileURLWithPath: filename)
+            do {
+                let data = try Data(contentsOf: url)
+                switch filename {
+
+                case newoldRootUserDefaults:
+                    if isRoot() {
+                        writeLog("\(newoldRootUserDefaults) migration", logLevel: .debug)
+                        let legacyDefaultKeys = CFPreferencesCopyKeyList(Bundle.main.bundleIdentifier! as CFString, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)
+                        for key in legacyDefaultKeys as! [CFString] {
+                            let keyValue = CFPreferencesCopyValue(key, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)
+                            CFPreferencesSetValue(key as CFString,
+                                                  keyValue as CFPropertyList,
+                                                  Bundle.main.bundleIdentifier! as CFString,
+                                                  kCFPreferencesAnyUser,
+                                                  kCFPreferencesAnyHost)
+                        }
+                        deletePath(newoldRootUserDefaults)
+                    }
+                case legacyOutsetPreferencesFile:
+                    writeLog("\(legacyOutsetPreferencesFile) migration", logLevel: .debug)
+                    do {
+                        let legacyPreferences = try PropertyListDecoder().decode(OutsetPreferences.self, from: data)
+                        writeOutsetPreferences(prefs: legacyPreferences)
+                        writeLog("Migrated Legacy Outset Preferences", logLevel: .debug)
+                        deletePath(legacyOutsetPreferencesFile)
+                    } catch {
+                        writeLog("legacy Preferences migration failed", logLevel: .error)
+                    }
+
+                case legacyRootRunOncePlistFile, legacyUserRunOncePlistFile:
+                    writeLog("\(legacyRootRunOncePlistFile) and \(legacyUserRunOncePlistFile) migration", logLevel: .debug)
+                    do {
+                        let legacyRunOncePlistData = try PropertyListDecoder().decode([String: Date].self, from: data)
+                        writeRunOncePlist(runOnceData: legacyRunOncePlistData)
+                        writeLog("Migrated Legacy Runonce Data", logLevel: .debug)
+                        if isRoot() {
+                            deletePath(legacyRootRunOncePlistFile)
+                        } else {
+                            deletePath(legacyUserRunOncePlistFile)
+                        }
+                    } catch {
+                        writeLog("legacy Run Once Plist migration failed", logLevel: .error)
+                    }
+
+                default:
+                    continue
+                }
+            } catch {
+                writeLog("could not load \(filename)", logLevel: .error)
+            }
+
+        }
+
+        if checkFileExists(path: shareDirectory) && folderContents(path: shareDirectory).isEmpty {
+            deletePath(shareDirectory)
+        }
+    }
+
+}
+
+func showPrefrencePath(_ action: String) {
+    var prefsPath: String
+    if isRoot() {
+        prefsPath = "/Library/Preferences".appending("/\(Bundle.main.bundleIdentifier!).plist")
+    } else {
+        let path = NSSearchPathForDirectoriesInDomains(.libraryDirectory, .userDomainMask, true)
+        prefsPath = path[0].appending("/Preferences").appending("/\(Bundle.main.bundleIdentifier!).plist")
+    }
+    writeLog("\(action)ing preference file: \(prefsPath)", logLevel: .debug)
+}
diff --git a/Outset/Functions/ShellUtils.swift b/Outset/Functions/ShellUtils.swift
new file mode 100644
index 0000000..ab811e0
--- /dev/null
+++ b/Outset/Functions/ShellUtils.swift
@@ -0,0 +1,50 @@
+//
+//  ShellUtils.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+
+func runShellCommand(_ command: String, args: [String] = [], verbose: Bool = false) -> (output: String, error: String, exitCode: Int32) {
+    // runs a shell command passed as an argument
+    // If the verbose parameter is set to true, will log the command being run and its status when completed.
+    // returns the output, error and exit code as a tuple.
+
+    if verbose {
+        writeLog("Running task \(command)", logLevel: .debug)
+    }
+    let task = Process()
+    let pipe = Pipe()
+    let errorpipe = Pipe()
+
+    var cmd = command
+    for arg in args {
+        cmd += " '\(arg)'"
+    }
+    let arguments = ["-c", cmd]
+
+    var output: String = ""
+    var error: String = ""
+
+    task.launchPath = "/bin/sh"
+    task.arguments = arguments
+    task.standardOutput = pipe
+    task.standardError = errorpipe
+    task.launch()
+
+    let data = pipe.fileHandleForReading.readDataToEndOfFile()
+    let errordata = errorpipe.fileHandleForReading.readDataToEndOfFile()
+
+    output.append(String(data: data, encoding: .utf8)!)
+    error.append(String(data: errordata, encoding: .utf8)!)
+
+    task.waitUntilExit()
+    let status = task.terminationStatus
+    if verbose {
+        writeLog("Completed task \(command) with status \(status)", logLevel: .debug)
+        writeLog("Task output: \n\(output)", logLevel: .debug)
+    }
+    return (output, error, status)
+}
diff --git a/Outset/Functions/SystemInfo.swift b/Outset/Functions/SystemInfo.swift
new file mode 100644
index 0000000..a6a214e
--- /dev/null
+++ b/Outset/Functions/SystemInfo.swift
@@ -0,0 +1,58 @@
+//
+//  SystemInfo.swift
+//  Outset
+//
+//  Created by Bart E Reardon on 5/9/2023.
+//
+
+import Foundation
+
+func getOSVersion() -> String {
+    // Returns the OS version
+    let osVersion = ProcessInfo().operatingSystemVersion
+    let version = "\(osVersion.majorVersion).\(osVersion.minorVersion).\(osVersion.patchVersion)"
+    return version
+}
+
+func getOSBuildVersion() -> String {
+    // Returns the current OS build from sysctl
+    var size = 0
+    sysctlbyname("kern.osversion", nil, &size, nil, 0)
+    var osversion = [CChar](repeating: 0, count: size)
+    sysctlbyname("kern.osversion", &osversion, &size, nil, 0)
+    return String(cString: osversion)
+
+}
+
+func getDeviceSerialNumber() -> String {
+    // Returns the current devices serial number
+    let platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice") )
+      guard platformExpert > 0 else {
+        return "Serial Unknown"
+      }
+      guard let serialNumber = (IORegistryEntryCreateCFProperty(platformExpert, kIOPlatformSerialNumberKey as CFString, kCFAllocatorDefault, 0).takeUnretainedValue() as? String)?.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) else {
+        return "Serial Unknown"
+      }
+      IOObjectRelease(platformExpert)
+      return serialNumber
+}
+
+func getMarketingModel() -> String {
+    let appleSiliconProduct = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/AppleARMPE/product")
+        let cfKeyValue = IORegistryEntryCreateCFProperty(appleSiliconProduct, "product-description" as CFString, kCFAllocatorDefault, 0)
+        IOObjectRelease(appleSiliconProduct)
+        let keyValue: AnyObject? = cfKeyValue?.takeUnretainedValue()
+        if keyValue != nil, let data = keyValue as? Data {
+            return String(data: data, encoding: String.Encoding.utf8)?.trimmingCharacters(in: CharacterSet(["\0"])) ?? ""
+        }
+        return ""
+}
+
+func getDeviceHardwareModel() -> String {
+    // Returns the current devices hardware model from sysctl
+    var size = 0
+    sysctlbyname("hw.model", nil, &size, nil, 0)
+    var model = [CChar](repeating: 0, count: size)
+    sysctlbyname("hw.model", &model, &size, nil, 0)
+    return String(cString: model)
+}
diff --git a/Outset/Functions/SystemUtils.swift b/Outset/Functions/SystemUtils.swift
index 6d48a58..27d9366 100644
--- a/Outset/Functions/SystemUtils.swift
+++ b/Outset/Functions/SystemUtils.swift
@@ -7,36 +7,9 @@
 
 import Foundation
 import SystemConfiguration
-import OSLog
 import IOKit
 import CoreFoundation
 
-struct OutsetPreferences: Codable {
-    var waitForNetwork: Bool = false
-    var networkTimeout: Int = 180
-    var ignoredUsers: [String] = []
-    var overrideLoginOnce: [String: Date] = [String: Date]()
-
-    enum CodingKeys: String, CodingKey {
-        case waitForNetwork = "wait_for_network"
-        case networkTimeout = "network_timeout"
-        case ignoredUsers = "ignored_users"
-        case overrideLoginOnce = "override_login_once"
-    }
-}
-
-struct FileHashes: Codable {
-    var sha256sum: [String: String] = [String: String]()
-}
-
-extension String {
-    func camelCaseToUnderscored() -> String {
-        let regex = try? NSRegularExpression(pattern: "([a-z])([A-Z])", options: [])
-        let range = NSRange(location: 0, length: utf16.count)
-        return regex?.stringByReplacingMatches(in: self, options: [], range: range, withTemplate: "$1_$2").lowercased() ?? self
-    }
-}
-
 enum Action {
     case enable
     case disable
@@ -53,66 +26,6 @@ func isRoot() -> Bool {
     return NSUserName() == "root"
 }
 
-func getValueForKey(_ key: String, inArray array: [String: String]) -> String? {
-    // short function that treats a [String: String] as a key value pair.
-    return array[key]
-}
-
-func writeLog(_ message: String, logLevel: OSLogType = .info, log: OSLog = osLog) {
-    // write to the system logs
-    os_log("%{public}@", log: log, type: logLevel, message)
-    if logLevel == .error || logLevel == .info || (debugMode && logLevel == .debug) {
-        // print info, errors and debug to stdout
-        print("\(oslogTypeToString(logLevel).uppercased()): \(message)")
-    }
-    // also write to a log file for accessability of those that don't want to manage the system log
-    writeFileLog(message: message, logLevel: logLevel)
-}
-
-func writeFileLog(message: String, logLevel: OSLogType) {
-    if logLevel == .debug && !debugMode {
-        return
-    }
-    let logFileURL = URL(fileURLWithPath: logFile)
-    if !checkFileExists(path: logFile) {
-        FileManager.default.createFile(atPath: logFileURL.path, contents: nil, attributes: nil)
-        let attributes = [FileAttributeKey.posixPermissions: 0o666]
-        do {
-            try FileManager.default.setAttributes(attributes, ofItemAtPath: logFileURL.path)
-        } catch {
-            print("\(oslogTypeToString(.error).uppercased()): Unable to create log file at \(logFile)")
-            return
-        }
-    }
-    do {
-        let fileHandle = try FileHandle(forWritingTo: logFileURL)
-        defer { fileHandle.closeFile() }
-
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
-
-        let date = dateFormatter.string(from: Date())
-        let logEntry = "\(date) \(oslogTypeToString(logLevel).uppercased()): \(message)\n"
-
-        fileHandle.seekToEndOfFile()
-        fileHandle.write(logEntry.data(using: .utf8)!)
-    } catch {
-        print("\(oslogTypeToString(.error).uppercased()): Unable to read log file at \(logFile)")
-        return
-    }
-}
-
-func oslogTypeToString(_ type: OSLogType) -> String {
-    switch type {
-    case OSLogType.default: return "default"
-    case OSLogType.info: return "info"
-    case OSLogType.debug: return "debug"
-    case OSLogType.error: return "error"
-    case OSLogType.fault: return "fault"
-    default: return "unknown"
-    }
-}
-
 func getConsoleUserInfo() -> (username: String, userID: String) {
     // We need the console user, not the process owner so NSUserName() won't work for our needs when outset runs as root
     var uid: uid_t = 0
@@ -123,169 +36,6 @@ func getConsoleUserInfo() -> (username: String, userID: String) {
     }
 }
 
-func writePreferences(prefs: OutsetPreferences) {
-
-    if debugMode {
-        showPrefrencePath("Stor")
-    }
-
-    let defaults = UserDefaults.standard
-
-    // Take the OutsetPreferences object and write it to UserDefaults
-    let mirror = Mirror(reflecting: prefs)
-    for child in mirror.children {
-        // Use the name of each property as the key, and save its value to UserDefaults
-        if let propertyName = child.label {
-            let key = propertyName.camelCaseToUnderscored()
-            if isRoot() {
-                // write the preference to /Library/Preferences/
-                CFPreferencesSetValue(key as CFString,
-                                      child.value as CFPropertyList,
-                                      Bundle.main.bundleIdentifier! as CFString,
-                                      kCFPreferencesAnyUser,
-                                      kCFPreferencesAnyHost)
-            } else {
-                // write the preference to ~/Library/Preferences/
-                defaults.set(child.value, forKey: key)
-            }
-        }
-    }
-}
-
-func loadPreferences() -> OutsetPreferences {
-
-    if debugMode {
-        showPrefrencePath("Load")
-    }
-
-    let defaults = UserDefaults.standard
-    var outsetPrefs = OutsetPreferences()
-
-    if isRoot() {
-        // force preferences to be read from /Library/Preferences instead of root's preferences
-        outsetPrefs.networkTimeout = CFPreferencesCopyValue("network_timeout" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? Int ?? 180
-        outsetPrefs.ignoredUsers = CFPreferencesCopyValue("ignored_users" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? [String] ?? []
-        outsetPrefs.overrideLoginOnce = CFPreferencesCopyValue("override_login_once" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? [String: Date] ?? [:]
-        outsetPrefs.waitForNetwork = (CFPreferencesCopyValue("wait_for_network" as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) != nil)
-    } else {
-        // load preferences for the current user, which includes /Library/Preferences
-        outsetPrefs.networkTimeout = defaults.integer(forKey: "network_timeout")
-        outsetPrefs.ignoredUsers = defaults.array(forKey: "ignored_users") as? [String] ?? []
-        outsetPrefs.overrideLoginOnce = defaults.object(forKey: "override_login_once") as? [String: Date] ?? [:]
-        outsetPrefs.waitForNetwork = defaults.bool(forKey: "wait_for_network")
-    }
-    return outsetPrefs
-}
-
-func loadRunOnce() -> [String: Date] {
-
-    if debugMode {
-        showPrefrencePath("Load")
-    }
-
-    let defaults = UserDefaults.standard
-    var runOnceKey = "run_once"
-
-    if isRoot() {
-        runOnceKey += "-"+getConsoleUserInfo().username
-        return CFPreferencesCopyValue(runOnceKey as CFString, Bundle.main.bundleIdentifier! as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost) as? [String: Date] ?? [:]
-    } else {
-        return defaults.object(forKey: runOnceKey) as? [String: Date] ?? [:]
-    }
-}
-
-func writeRunOnce(runOnceData: [String: Date]) {
-
-    if debugMode {
-        showPrefrencePath("Stor")
-    }
-
-    let defaults = UserDefaults.standard
-    var runOnceKey = "run_once"
-
-    if isRoot() {
-        runOnceKey += "-"+getConsoleUserInfo().username
-        CFPreferencesSetValue(runOnceKey as CFString,
-                              runOnceData as CFPropertyList,
-                              Bundle.main.bundleIdentifier! as CFString,
-                              kCFPreferencesAnyUser,
-                              kCFPreferencesAnyHost)
-    } else {
-        defaults.set(runOnceData, forKey: runOnceKey)
-    }
-}
-
-func showPrefrencePath(_ action: String) {
-    var prefsPath: String
-    if isRoot() {
-        prefsPath = "/Library/Preferences".appending("/\(Bundle.main.bundleIdentifier!).plist")
-    } else {
-        let path = NSSearchPathForDirectoriesInDomains(.libraryDirectory, .userDomainMask, true)
-        prefsPath = path[0].appending("/Preferences").appending("/\(Bundle.main.bundleIdentifier!).plist")
-    }
-    writeLog("\(action)ing preference file: \(prefsPath)", logLevel: .debug)
-}
-
-func checksumLoadApprovedFiles() -> [String: String] {
-    // imports the list of file hashes that are approved to run
-    var outsetFileHashList = FileHashes()
-
-    let defaults = UserDefaults.standard
-    let hashes = defaults.object(forKey: "sha256sum")
-
-    if let data = hashes as? [String: String] {
-        for (key, value) in data {
-            outsetFileHashList.sha256sum[key] = value
-        }
-    }
-
-    return outsetFileHashList.sha256sum
-}
-
-func isNetworkUp() -> Bool {
-    // https://stackoverflow.com/a/39782859/17584669
-    // perform a check to see if the network is available.
-
-    var zeroAddress = sockaddr_in(sin_len: 0, sin_family: 0, sin_port: 0, sin_addr: in_addr(s_addr: 0), sin_zero: (0, 0, 0, 0, 0, 0, 0, 0))
-    zeroAddress.sin_len = UInt8(MemoryLayout.size(ofValue: zeroAddress))
-    zeroAddress.sin_family = sa_family_t(AF_INET)
-
-    let defaultRouteReachability = withUnsafePointer(to: &zeroAddress) {
-        $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {zeroSockAddress in
-            SCNetworkReachabilityCreateWithAddress(nil, zeroSockAddress)
-        }
-    }
-
-    var flags: SCNetworkReachabilityFlags = SCNetworkReachabilityFlags(rawValue: 0)
-    if SCNetworkReachabilityGetFlags(defaultRouteReachability!, &flags) == false {
-        return false
-    }
-
-    let isReachable = (flags.rawValue & UInt32(kSCNetworkFlagsReachable)) != 0
-    let needsConnection = (flags.rawValue & UInt32(kSCNetworkFlagsConnectionRequired)) != 0
-    let ret = (isReachable && !needsConnection)
-
-    return ret
-}
-
-func waitForNetworkUp(timeout: Double) -> Bool {
-    // used during --boot if "wait_for_network" prefrence is true
-    var networkUp = false
-    let deadline = DispatchTime.now() + timeout
-    while !networkUp && DispatchTime.now() < deadline {
-        writeLog("Waiting for network: \(timeout) seconds", logLevel: .debug)
-        networkUp = isNetworkUp()
-        if !networkUp {
-            writeLog("Waiting...", logLevel: .debug)
-            Thread.sleep(forTimeInterval: 1)
-        }
-    }
-    if !networkUp && DispatchTime.now() > deadline {
-        writeLog("No network connectivity detected after \(timeout) seconds", logLevel: .error)
-    }
-    return networkUp
-}
-
 func loginWindowUpdateState(_ action: Action) {
     var cmd: String
     let loginWindowPlist: String = "/System/Library/LaunchDaemons/com.apple.loginwindow.plist"
@@ -299,63 +49,3 @@ func loginWindowUpdateState(_ action: Action) {
     }
         _ = runShellCommand(cmd)
 }
-
-func getDeviceHardwareModel() -> String {
-    // Returns the current devices hardware model from sysctl
-    var size = 0
-    sysctlbyname("hw.model", nil, &size, nil, 0)
-    var model = [CChar](repeating: 0, count: size)
-    sysctlbyname("hw.model", &model, &size, nil, 0)
-    return String(cString: model)
-}
-
-func getMarketingModel() -> String {
-    let appleSiliconProduct = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/AppleARMPE/product")
-        let cfKeyValue = IORegistryEntryCreateCFProperty(appleSiliconProduct, "product-description" as CFString, kCFAllocatorDefault, 0)
-        IOObjectRelease(appleSiliconProduct)
-        let keyValue: AnyObject? = cfKeyValue?.takeUnretainedValue()
-        if keyValue != nil, let data = keyValue as? Data {
-            return String(data: data, encoding: String.Encoding.utf8)?.trimmingCharacters(in: CharacterSet(["\0"])) ?? ""
-        }
-        return ""
-}
-
-func getDeviceSerialNumber() -> String {
-    // Returns the current devices serial number
-    let platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice") )
-      guard platformExpert > 0 else {
-        return "Serial Unknown"
-      }
-      guard let serialNumber = (IORegistryEntryCreateCFProperty(platformExpert, kIOPlatformSerialNumberKey as CFString, kCFAllocatorDefault, 0).takeUnretainedValue() as? String)?.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) else {
-        return "Serial Unknown"
-      }
-      IOObjectRelease(platformExpert)
-      return serialNumber
-}
-
-func getOSBuildVersion() -> String {
-    // Returns the current OS build from sysctl
-    var size = 0
-    sysctlbyname("kern.osversion", nil, &size, nil, 0)
-    var osversion = [CChar](repeating: 0, count: size)
-    sysctlbyname("kern.osversion", &osversion, &size, nil, 0)
-    return String(cString: osversion)
-
-}
-
-func getOSVersion() -> String {
-    // Returns the OS version
-    let osVersion = ProcessInfo().operatingSystemVersion
-    let version = "\(osVersion.majorVersion).\(osVersion.minorVersion).\(osVersion.patchVersion)"
-    return version
-}
-
-func writeSysReport() {
-    // Logs system information to log file
-    writeLog("User: \(getConsoleUserInfo())", logLevel: .debug)
-    writeLog("Model: \(getDeviceHardwareModel())", logLevel: .debug)
-    writeLog("Marketing Model: \(getMarketingModel())", logLevel: .debug)
-    writeLog("Serial: \(getDeviceSerialNumber())", logLevel: .debug)
-    writeLog("OS: \(getOSVersion())", logLevel: .debug)
-    writeLog("Build: \(getOSBuildVersion())", logLevel: .debug)
-}
diff --git a/Outset/Outset.swift b/Outset/Outset.swift
index 14c136a..57bc386 100644
--- a/Outset/Outset.swift
+++ b/Outset/Outset.swift
@@ -41,7 +41,7 @@ var debugMode: Bool = false
 var loginwindowState: Bool = true
 var consoleUser: String = getConsoleUserInfo().username
 var continueFirstBoot: Bool = true
-var prefs = loadPreferences()
+var prefs = loadOutsetPreferences()
 
 // Log Stuff
 let bundleID = Bundle.main.bundleIdentifier ?? "io.macadmins.Outset"
@@ -151,7 +151,7 @@ struct Outset: ParsableCommand {
             writeLog("Processing scheduled runs for boot", logLevel: .debug)
             ensureWorkingFolders()
 
-            writePreferences(prefs: prefs)
+            writeOutsetPreferences(prefs: prefs)
 
             if !folderContents(path: bootOnceDir).isEmpty {
                 if prefs.waitForNetwork {
@@ -277,7 +277,7 @@ struct Outset: ParsableCommand {
                     prefs.ignoredUsers.append(username)
                 }
             }
-            writePreferences(prefs: prefs)
+            writeOutsetPreferences(prefs: prefs)
         }
 
         if !removeIgnoredUser.isEmpty {
@@ -287,7 +287,7 @@ struct Outset: ParsableCommand {
                     prefs.ignoredUsers.remove(at: index)
                 }
             }
-            writePreferences(prefs: prefs)
+            writeOutsetPreferences(prefs: prefs)
         }
 
         if !addOveride.isEmpty {
@@ -300,7 +300,7 @@ struct Outset: ParsableCommand {
                 writeLog("Adding \(overide) to overide list", logLevel: .debug)
                 prefs.overrideLoginOnce[overide] = Date()
             }
-            writePreferences(prefs: prefs)
+            writeOutsetPreferences(prefs: prefs)
         }
 
         if !removeOveride.isEmpty {
@@ -312,7 +312,7 @@ struct Outset: ParsableCommand {
                 writeLog("Removing \(overide) from overide list", logLevel: .debug)
                 prefs.overrideLoginOnce.removeValue(forKey: overide)
             }
-            writePreferences(prefs: prefs)
+            writeOutsetPreferences(prefs: prefs)
         }
 
         if !checksum.isEmpty || !computeSHA.isEmpty {

From e3cd80ae4c3867f53e50339c9e8dbc1ca1f50445 Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Tue, 5 Sep 2023 18:47:16 +1000
Subject: [PATCH 08/11] Folder re-name bumped version to 4.1.0

---
 Outset.xcodeproj/project.pbxproj                 | 14 +++++++-------
 Outset/Info.plist                                |  4 ++--
 Outset/Outset.swift                              | 15 +++++++--------
 Outset/{Functions => Utils}/Checksum.swift       |  0
 Outset/{Functions => Utils}/FileUtils.swift      |  0
 Outset/{Functions => Utils}/ItemProcessing.swift |  0
 Outset/{Functions => Utils}/Logging.swift        |  0
 Outset/{Functions => Utils}/Network.swift        |  0
 Outset/{Functions => Utils}/Preferences.swift    |  0
 Outset/{Functions => Utils}/Services.swift       |  0
 Outset/{Functions => Utils}/ShellUtils.swift     |  0
 Outset/{Functions => Utils}/SystemInfo.swift     |  0
 Outset/{Functions => Utils}/SystemUtils.swift    |  0
 13 files changed, 16 insertions(+), 17 deletions(-)
 rename Outset/{Functions => Utils}/Checksum.swift (100%)
 rename Outset/{Functions => Utils}/FileUtils.swift (100%)
 rename Outset/{Functions => Utils}/ItemProcessing.swift (100%)
 rename Outset/{Functions => Utils}/Logging.swift (100%)
 rename Outset/{Functions => Utils}/Network.swift (100%)
 rename Outset/{Functions => Utils}/Preferences.swift (100%)
 rename Outset/{Functions => Utils}/Services.swift (100%)
 rename Outset/{Functions => Utils}/ShellUtils.swift (100%)
 rename Outset/{Functions => Utils}/SystemInfo.swift (100%)
 rename Outset/{Functions => Utils}/SystemUtils.swift (100%)

diff --git a/Outset.xcodeproj/project.pbxproj b/Outset.xcodeproj/project.pbxproj
index 883691b..f7b3304 100644
--- a/Outset.xcodeproj/project.pbxproj
+++ b/Outset.xcodeproj/project.pbxproj
@@ -125,7 +125,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		4124EFA6293B30D6003B00F4 /* Functions */ = {
+		4124EFA6293B30D6003B00F4 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
 				4124EFA2293B2F9B003B00F4 /* FileUtils.swift */,
@@ -139,7 +139,7 @@
 				CC3DC8292AA70E380050EE16 /* Checksum.swift */,
 				CC3DC8322AA7100C0050EE16 /* ShellUtils.swift */,
 			);
-			path = Functions;
+			path = Utils;
 			sourceTree = "<group>";
 		};
 		4124EFAE29414A5D003B00F4 /* Outset */ = {
@@ -147,7 +147,7 @@
 			children = (
 				4124EF90293822F4003B00F4 /* Outset.swift */,
 				CC3DC82B2AA70EC90050EE16 /* Extensions */,
-				4124EFA6293B30D6003B00F4 /* Functions */,
+				4124EFA6293B30D6003B00F4 /* Utils */,
 				4124EFC329414DA4003B00F4 /* Info.plist */,
 				4124EFB329414A5E003B00F4 /* Assets.xcassets */,
 				4124EFB829414A5E003B00F4 /* Outset.entitlements */,
@@ -512,7 +512,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.5;
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.macadmins.Outset;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -549,7 +549,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.5;
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.macadmins.Outset;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -587,7 +587,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.4;
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.macadmins.Outset;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -629,7 +629,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.4;
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.macadmins.Outset;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Outset/Info.plist b/Outset/Info.plist
index 211f008..87851f5 100644
--- a/Outset/Info.plist
+++ b/Outset/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.5</string>
+	<string>4.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>4.0.5</string>
+	<string>4.1.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Outset/Outset.swift b/Outset/Outset.swift
index 57bc386..a3d756d 100644
--- a/Outset/Outset.swift
+++ b/Outset/Outset.swift
@@ -132,6 +132,13 @@ struct Outset: ParsableCommand {
             debugMode = true
         }
 
+        if version {
+            print(outsetVersion)
+            if debugMode {
+                writeSysReport()
+            }
+        }
+
         if enableServices, #available(macOS 13.0, *) {
             let manager = ServiceManager()
             manager.registerDaemons()
@@ -160,7 +167,6 @@ struct Outset: ParsableCommand {
                     continueFirstBoot = waitForNetworkUp(timeout: floor(Double(prefs.networkTimeout) / 10))
                 }
                 if continueFirstBoot {
-                    writeSysReport()
                     processItems(bootOnceDir, deleteItems: true)
                 } else {
                     writeLog("Unable to connect to network. Skipping boot-once scripts...", logLevel: .error)
@@ -337,12 +343,5 @@ struct Outset: ParsableCommand {
                 writeLog("\(filename) : \(checksum)", logLevel: .info)
             }
         }
-
-        if version {
-            print(outsetVersion)
-            if debugMode {
-                writeSysReport()
-            }
-        }
     }
 }
diff --git a/Outset/Functions/Checksum.swift b/Outset/Utils/Checksum.swift
similarity index 100%
rename from Outset/Functions/Checksum.swift
rename to Outset/Utils/Checksum.swift
diff --git a/Outset/Functions/FileUtils.swift b/Outset/Utils/FileUtils.swift
similarity index 100%
rename from Outset/Functions/FileUtils.swift
rename to Outset/Utils/FileUtils.swift
diff --git a/Outset/Functions/ItemProcessing.swift b/Outset/Utils/ItemProcessing.swift
similarity index 100%
rename from Outset/Functions/ItemProcessing.swift
rename to Outset/Utils/ItemProcessing.swift
diff --git a/Outset/Functions/Logging.swift b/Outset/Utils/Logging.swift
similarity index 100%
rename from Outset/Functions/Logging.swift
rename to Outset/Utils/Logging.swift
diff --git a/Outset/Functions/Network.swift b/Outset/Utils/Network.swift
similarity index 100%
rename from Outset/Functions/Network.swift
rename to Outset/Utils/Network.swift
diff --git a/Outset/Functions/Preferences.swift b/Outset/Utils/Preferences.swift
similarity index 100%
rename from Outset/Functions/Preferences.swift
rename to Outset/Utils/Preferences.swift
diff --git a/Outset/Functions/Services.swift b/Outset/Utils/Services.swift
similarity index 100%
rename from Outset/Functions/Services.swift
rename to Outset/Utils/Services.swift
diff --git a/Outset/Functions/ShellUtils.swift b/Outset/Utils/ShellUtils.swift
similarity index 100%
rename from Outset/Functions/ShellUtils.swift
rename to Outset/Utils/ShellUtils.swift
diff --git a/Outset/Functions/SystemInfo.swift b/Outset/Utils/SystemInfo.swift
similarity index 100%
rename from Outset/Functions/SystemInfo.swift
rename to Outset/Utils/SystemInfo.swift
diff --git a/Outset/Functions/SystemUtils.swift b/Outset/Utils/SystemUtils.swift
similarity index 100%
rename from Outset/Functions/SystemUtils.swift
rename to Outset/Utils/SystemUtils.swift

From f03950b44fb401a59406266c26dcbfb101fa9bf7 Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Tue, 5 Sep 2023 21:21:57 +1000
Subject: [PATCH 09/11] update logging and output routines so error and debug
 are sent to stderr instead of stdout

---
 Outset/Outset.swift         |  4 ++--
 Outset/Utils/Checksum.swift |  9 +++++---
 Outset/Utils/Logging.swift  | 45 ++++++++++++++++++++++++++++++++-----
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/Outset/Outset.swift b/Outset/Outset.swift
index a3d756d..42dbc15 100644
--- a/Outset/Outset.swift
+++ b/Outset/Outset.swift
@@ -133,7 +133,7 @@ struct Outset: ParsableCommand {
         }
 
         if version {
-            print(outsetVersion)
+            printStdOut("\(outsetVersion)")
             if debugMode {
                 writeSysReport()
             }
@@ -331,7 +331,7 @@ struct Outset: ParsableCommand {
                 for fileToHash in checksum {
                     let url = URL(fileURLWithPath: fileToHash)
                     if let hash = sha256(for: url) {
-                        print("Checksum for file \(fileToHash): \(hash)")
+                        printStdOut("Checksum for file \(fileToHash): \(hash)")
                     }
                 }
             }
diff --git a/Outset/Utils/Checksum.swift b/Outset/Utils/Checksum.swift
index e5a66df..722ddc2 100644
--- a/Outset/Utils/Checksum.swift
+++ b/Outset/Utils/Checksum.swift
@@ -75,11 +75,14 @@ func checksumAllFiles() {
                 let fileAttributes = try fileURL.resourceValues(forKeys: [.isRegularFileKey])
                 if fileAttributes.isRegularFile! && fileURL.pathExtension != "plist" && fileURL.lastPathComponent != "outset" {
                     if let shasum = sha256(for: fileURL) {
-                        print("\(fileURL.relativePath) : \(shasum)")
+                        printStdOut("\(fileURL.relativePath) : \(shasum)")
                         shasumPlist.sha256sum[fileURL.relativePath] = shasum
                     }
                 }
-            } catch { print(error, fileURL) }
+            } catch {
+                printStdErr(error.localizedDescription)
+                printStdErr(fileURL.absoluteString)
+            }
         }
 
         writeLog("PLIST", logLevel: .info)
@@ -90,7 +93,7 @@ func checksumAllFiles() {
             if let plist = try PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] {
                 let formatted = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
                 if let string = String(data: formatted, encoding: .utf8) {
-                    print(string)
+                    printStdOut(string)
                 }
             }
         } catch {
diff --git a/Outset/Utils/Logging.swift b/Outset/Utils/Logging.swift
index 662641a..56c7362 100644
--- a/Outset/Utils/Logging.swift
+++ b/Outset/Utils/Logging.swift
@@ -8,6 +8,21 @@
 import Foundation
 import OSLog
 
+// swiftlint:disable force_try
+class StandardError: TextOutputStream {
+    func write(_ string: String) {
+      if #available(macOS 10.15.4, *) {
+          try! FileHandle.standardError.write(contentsOf: Data(string.utf8))
+      } else {
+          // Fallback on earlier versions
+          if let data = string.data(using: .utf8) {
+              FileHandle.standardError.write(data)
+          }
+      }
+    }
+}
+// swiftlint:enable force_try
+
 func oslogTypeToString(_ type: OSLogType) -> String {
     switch type {
     case OSLogType.default: return "default"
@@ -19,18 +34,34 @@ func oslogTypeToString(_ type: OSLogType) -> String {
     }
 }
 
+func printStdErr(_ errorMessage: String) {
+    var standardError = StandardError()
+    print(errorMessage, to: &standardError)
+}
+
+func printStdOut(_ message: String) {
+    print(message)
+}
+
 func writeLog(_ message: String, logLevel: OSLogType = .info, log: OSLog = osLog) {
     // write to the system logs
+
+    // let logger = Logger()  // 'Logger' is only available in macOS 11.0 or newer so we use os_log
+
     os_log("%{public}@", log: log, type: logLevel, message)
-    if logLevel == .error || logLevel == .info || (debugMode && logLevel == .debug) {
-        // print info, errors and debug to stdout
-        print("\(oslogTypeToString(logLevel).uppercased()): \(message)")
+    switch logLevel {
+    case .error, .debug, .fault:
+        printStdErr("\(oslogTypeToString(logLevel).uppercased()): \(message)")
+    default:
+        printStdOut("\(oslogTypeToString(logLevel).uppercased()): \(message)")
     }
-    // also write to a log file for accessability of those that don't want to manage the system log
+
+    // also write to a log file
     writeFileLog(message: message, logLevel: logLevel)
 }
 
 func writeFileLog(message: String, logLevel: OSLogType) {
+    // write to a log file for accessability of those that don't want to manage the system log
     if logLevel == .debug && !debugMode {
         return
     }
@@ -41,7 +72,8 @@ func writeFileLog(message: String, logLevel: OSLogType) {
         do {
             try FileManager.default.setAttributes(attributes, ofItemAtPath: logFileURL.path)
         } catch {
-            print("\(oslogTypeToString(.error).uppercased()): Unable to create log file at \(logFile)")
+            printStdErr("\(oslogTypeToString(.error).uppercased()): Unable to create log file at \(logFile)")
+            printStdErr(error.localizedDescription)
             return
         }
     }
@@ -58,7 +90,8 @@ func writeFileLog(message: String, logLevel: OSLogType) {
         fileHandle.seekToEndOfFile()
         fileHandle.write(logEntry.data(using: .utf8)!)
     } catch {
-        print("\(oslogTypeToString(.error).uppercased()): Unable to read log file at \(logFile)")
+        printStdErr("\(oslogTypeToString(.error).uppercased()): Unable to read log file at \(logFile)")
+        printStdErr(error.localizedDescription)
         return
     }
 }

From 70bdfcd2347eca0d292c9977482d81814b70bfac Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Tue, 5 Sep 2023 22:31:08 +1000
Subject: [PATCH 10/11] Added log rotate function - crude for now, should
 probably look at https://github.com/apple/swift-log package

---
 Outset/Outset.swift          |  7 ++++++-
 Outset/Utils/FileUtils.swift | 32 ++++++++++++++++++++++++++++++++
 Outset/Utils/Logging.swift   | 10 +++++-----
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/Outset/Outset.swift b/Outset/Outset.swift
index 42dbc15..b91f484 100644
--- a/Outset/Outset.swift
+++ b/Outset/Outset.swift
@@ -26,7 +26,8 @@ let loginOncePrivilegedDir = outsetDirectory+"login-privileged-once"
 let onDemandDir = outsetDirectory+"on-demand"
 let shareDirectory = outsetDirectory+"share/"
 let logDirectory = outsetDirectory+"logs"
-let logFile = logDirectory+"/outset.log"
+let logFileName = "outset.log"
+let logFilePath = logDirectory+"/"+logFileName
 
 let onDemandTrigger = "/private/tmp/.io.macadmins.outset.ondemand.launchd"
 let loginPrivilegedTrigger = "/private/tmp/.io.macadmins.outset.login-privileged.launchd"
@@ -46,6 +47,7 @@ var prefs = loadOutsetPreferences()
 // Log Stuff
 let bundleID = Bundle.main.bundleIdentifier ?? "io.macadmins.Outset"
 let osLog = OSLog(subsystem: bundleID, category: "main")
+let logRotateDays: Int = 30
 
 // Logic insertion point
 @main
@@ -155,6 +157,9 @@ struct Outset: ParsableCommand {
         }
 
         if boot {
+            // perform log file rotation
+            performLogRotation(logFolderPath: logDirectory, logFileBaseName: logFileName)
+
             writeLog("Processing scheduled runs for boot", logLevel: .debug)
             ensureWorkingFolders()
 
diff --git a/Outset/Utils/FileUtils.swift b/Outset/Utils/FileUtils.swift
index 7310fe6..275c391 100644
--- a/Outset/Utils/FileUtils.swift
+++ b/Outset/Utils/FileUtils.swift
@@ -192,3 +192,35 @@ func detachDmg(dmgMount: String) -> String {
     }
     return output.trimmingCharacters(in: .whitespacesAndNewlines)
 }
+
+func performLogRotation(logFolderPath: String, logFileBaseName: String, maxLogFiles: Int = 30) {
+    let fileManager = FileManager.default
+    let currentDay = Calendar.current.component(.day, from: Date())
+
+    // Check if the day has changed
+    let newestLogFile = logFolderPath + "/" + logFileBaseName
+    if fileManager.fileExists(atPath: newestLogFile) {
+        let fileCreationDate = try? fileManager.attributesOfItem(atPath: newestLogFile)[.creationDate] as? Date
+        if let creationDate = fileCreationDate {
+            let dayOfCreation = Calendar.current.component(.day, from: creationDate)
+            if dayOfCreation != currentDay {
+                // rotate files
+                for archivedLogFile in (1...maxLogFiles).reversed() {
+                    let sourcePath = logFolderPath + "/" + (archivedLogFile == 1 ? logFileBaseName : "\(logFileBaseName).\(archivedLogFile-1)")
+                    let destinationPath = logFolderPath + "/" + "\(logFileBaseName).\(archivedLogFile)"
+
+                    if fileManager.fileExists(atPath: sourcePath) {
+                        if archivedLogFile == maxLogFiles {
+                            // Delete the oldest log file if it exists
+                            try? fileManager.removeItem(atPath: sourcePath)
+                        } else {
+                            // Move the log file to the next number in the rotation
+                            try? fileManager.moveItem(atPath: sourcePath, toPath: destinationPath)
+                        }
+                    }
+                }
+                writeLog("Logrotate complete", logLevel: .debug)
+            }
+        }
+    }
+}
diff --git a/Outset/Utils/Logging.swift b/Outset/Utils/Logging.swift
index 56c7362..195fb31 100644
--- a/Outset/Utils/Logging.swift
+++ b/Outset/Utils/Logging.swift
@@ -14,7 +14,7 @@ class StandardError: TextOutputStream {
       if #available(macOS 10.15.4, *) {
           try! FileHandle.standardError.write(contentsOf: Data(string.utf8))
       } else {
-          // Fallback on earlier versions
+          // Fallback on earlier versions (should work on pre 10.15.4 but untested)
           if let data = string.data(using: .utf8) {
               FileHandle.standardError.write(data)
           }
@@ -65,14 +65,14 @@ func writeFileLog(message: String, logLevel: OSLogType) {
     if logLevel == .debug && !debugMode {
         return
     }
-    let logFileURL = URL(fileURLWithPath: logFile)
-    if !checkFileExists(path: logFile) {
+    let logFileURL = URL(fileURLWithPath: logFilePath)
+    if !checkFileExists(path: logFilePath) {
         FileManager.default.createFile(atPath: logFileURL.path, contents: nil, attributes: nil)
         let attributes = [FileAttributeKey.posixPermissions: 0o666]
         do {
             try FileManager.default.setAttributes(attributes, ofItemAtPath: logFileURL.path)
         } catch {
-            printStdErr("\(oslogTypeToString(.error).uppercased()): Unable to create log file at \(logFile)")
+            printStdErr("\(oslogTypeToString(.error).uppercased()): Unable to create log file at \(logFilePath)")
             printStdErr(error.localizedDescription)
             return
         }
@@ -90,7 +90,7 @@ func writeFileLog(message: String, logLevel: OSLogType) {
         fileHandle.seekToEndOfFile()
         fileHandle.write(logEntry.data(using: .utf8)!)
     } catch {
-        printStdErr("\(oslogTypeToString(.error).uppercased()): Unable to read log file at \(logFile)")
+        printStdErr("\(oslogTypeToString(.error).uppercased()): Unable to read log file at \(logFilePath)")
         printStdErr(error.localizedDescription)
         return
     }

From bcf8537400674bf5770d982dc755c8b0ee549692 Mon Sep 17 00:00:00 2001
From: Bart Reardon <bart.reardon@me.com>
Date: Tue, 5 Sep 2023 22:39:46 +1000
Subject: [PATCH 11/11] moved some log variables around

---
 Outset/Outset.swift | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Outset/Outset.swift b/Outset/Outset.swift
index b91f484..3f2138b 100644
--- a/Outset/Outset.swift
+++ b/Outset/Outset.swift
@@ -25,9 +25,6 @@ let loginEveryPrivilegedDir = outsetDirectory+"login-privileged-every"
 let loginOncePrivilegedDir = outsetDirectory+"login-privileged-once"
 let onDemandDir = outsetDirectory+"on-demand"
 let shareDirectory = outsetDirectory+"share/"
-let logDirectory = outsetDirectory+"logs"
-let logFileName = "outset.log"
-let logFilePath = logDirectory+"/"+logFileName
 
 let onDemandTrigger = "/private/tmp/.io.macadmins.outset.ondemand.launchd"
 let loginPrivilegedTrigger = "/private/tmp/.io.macadmins.outset.login-privileged.launchd"
@@ -47,7 +44,11 @@ var prefs = loadOutsetPreferences()
 // Log Stuff
 let bundleID = Bundle.main.bundleIdentifier ?? "io.macadmins.Outset"
 let osLog = OSLog(subsystem: bundleID, category: "main")
-let logRotateDays: Int = 30
+// We could make these availab as preferences perhaps
+let logFileName = "outset.log"
+let logFileMaxCount: Int = 30
+let logDirectory = outsetDirectory+"logs"
+let logFilePath = logDirectory+"/"+logFileName
 
 // Logic insertion point
 @main
@@ -158,7 +159,7 @@ struct Outset: ParsableCommand {
 
         if boot {
             // perform log file rotation
-            performLogRotation(logFolderPath: logDirectory, logFileBaseName: logFileName)
+            performLogRotation(logFolderPath: logDirectory, logFileBaseName: logFileName, maxLogFiles: logFileMaxCount)
 
             writeLog("Processing scheduled runs for boot", logLevel: .debug)
             ensureWorkingFolders()