diff --git a/SYM-Helper.xcodeproj/project.pbxproj b/SYM-Helper.xcodeproj/project.pbxproj index 4d74c59..c361020 100644 --- a/SYM-Helper.xcodeproj/project.pbxproj +++ b/SYM-Helper.xcodeproj/project.pbxproj @@ -373,7 +373,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = "jamf.ie.SYM-Helper"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -402,7 +402,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = "jamf.ie.SYM-Helper"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/SYM-Helper/Base.lproj/Main.storyboard b/SYM-Helper/Base.lproj/Main.storyboard index cdaa99f..6c4da0c 100644 --- a/SYM-Helper/Base.lproj/Main.storyboard +++ b/SYM-Helper/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - - + + diff --git a/SYM-Helper/Globals.swift b/SYM-Helper/Globals.swift index 31ff633..60e64c6 100644 --- a/SYM-Helper/Globals.swift +++ b/SYM-Helper/Globals.swift @@ -30,13 +30,14 @@ var useApiClient = 0 let alert: Alert = Alert() let writeToLog: WriteToLog = WriteToLog() -var scriptSource = "" +var scriptSource = "" // icon default var defaultIcon = "" // script defaults -var defaultScriptSource = "https://raw.githubusercontent.com/dan-snelson/Setup-Your-Mac/main/Setup-Your-Mac-via-Dialog.bash" +//old defaultScriptSource: https://raw.githubusercontent.com/dan-snelson/Setup-Your-Mac/main/Setup-Your-Mac-via-Dialog.bash +var defaultScriptSource = "https://raw.githubusercontent.com/setup-your-mac/Setup-Your-Mac/main/Setup-Your-Mac-via-Dialog.bash" // brandng defaults var defaultBannerImage = "https://img.freepik.com/free-vector/green-abstract-geometric-wallpaper_52683-29623.jpg" diff --git a/SYM-Helper/SettingsVC.swift b/SYM-Helper/SettingsVC.swift index 29e2e1c..972a6dd 100644 --- a/SYM-Helper/SettingsVC.swift +++ b/SYM-Helper/SettingsVC.swift @@ -483,6 +483,9 @@ class SettingsVC: NSViewController, NSTextFieldDelegate, NSTextViewDelegate, Sen whichTab = settingsArray[0].tab settings_TabView.selectTabViewItem(withIdentifier: whichTab) validScriptSource = Settings.shared.dict["scriptSource"] as? String ?? defaultScriptSource + + validScriptSource = validScriptSource.replacingOccurrences(of: "/dan-snelson/", with: "/setup-your-mac/") + newScriptSource = validScriptSource scriptSource_TextField.stringValue = validScriptSource diff --git a/SYM-Helper/ViewController.swift b/SYM-Helper/ViewController.swift index ce729f5..b8e239c 100644 --- a/SYM-Helper/ViewController.swift +++ b/SYM-Helper/ViewController.swift @@ -1061,6 +1061,8 @@ class ViewController: NSViewController, NSTextFieldDelegate, URLSessionDelegate, connectTo_Button.isHidden = false scriptSource = defaults.string(forKey: "scriptSource") ?? defaultScriptSource + scriptSource = scriptSource.replacingOccurrences(of: "/dan-snelson/", with: "/setup-your-mac/") + // read settings, if they exist Settings.shared.dict = ConfigsSettings().retrieve(dataType: "settings") @@ -1261,8 +1263,6 @@ class ViewController: NSViewController, NSTextFieldDelegate, URLSessionDelegate, override func viewDidLoad() { super.viewDidLoad() - - // Do any additional setup after loading the view. NotificationCenter.default.addObserver(self, selector: #selector(updateScriptVersion(_:)), name: .updateScriptVersion, object: nil) @@ -1277,14 +1277,14 @@ class ViewController: NSViewController, NSTextFieldDelegate, URLSessionDelegate, } } - listitemDisplayText_TextField.delegate = self - progressText_TextField.delegate = self - iconPath_TextField.delegate = self - validation_TextField.delegate = self + listitemDisplayText_TextField.delegate = self + progressText_TextField.delegate = self + iconPath_TextField.delegate = self + validation_TextField.delegate = self allPolicies_Spinner.startAnimation(self) - policies_TableView.delegate = self - policies_TableView.dataSource = self + policies_TableView.delegate = self + policies_TableView.dataSource = self policies_TableView.doubleAction = #selector(addToPolicyArray) // set columg headers @@ -1294,8 +1294,8 @@ class ViewController: NSViewController, NSTextFieldDelegate, URLSessionDelegate, let descriptorName = NSSortDescriptor(key: "name", ascending: true) policies_TableView.tableColumns[0].sortDescriptorPrototype = descriptorName - selectedPolicies_TableView.delegate = self - selectedPolicies_TableView.dataSource = self + selectedPolicies_TableView.delegate = self + selectedPolicies_TableView.dataSource = self selectedPolicies_TableView.doubleAction = #selector(removeFromPolicyArray) selectedPolicies_TableView.tableColumns.forEach { (column) in @@ -1305,7 +1305,6 @@ class ViewController: NSViewController, NSTextFieldDelegate, URLSessionDelegate, selectedPolicies_TableView.registerForDraggedTypes([.string]) configuration_Button.selectItem(at: 0) - } override func viewDidAppear() {