From e3cd80ae4c3867f53e50339c9e8dbc1ca1f50445 Mon Sep 17 00:00:00 2001 From: Bart Reardon Date: Tue, 5 Sep 2023 18:47:16 +1000 Subject: [PATCH] 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 = ""; }; - 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 = ""; }; 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 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 4.0.5 + 4.1.0 CFBundleVersion - 4.0.5 + 4.1.0 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion 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