Skip to content

Commit

Permalink
Merge pull request #41 from SecondSonConsulting/dev
Browse files Browse the repository at this point in the history 
v2.1 Pull Request
  • Loading branch information
@BigMacAdmin
BigMacAdmin authored Mar 18, 2024
2 parents 1322ff4 + f3ff3f8 commit d1fba34
Show file tree
Hide file tree
Showing 8 changed files with 295 additions and 160 deletions.
296 changes: 154 additions & 142 deletions Baseline.sh
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Build/Baseline_daemon-postinstall.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/zsh
#!/bin/zsh --no-rcs

# Set variables for path/name
launchDPath="/Library/LaunchDaemons"
Expand Down
2 changes: 1 addition & 1 deletion Build/Baseline_daemon-preinstall.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/zsh
#!/bin/zsh --no-rcs

# Function to exit with an error message
exit_with_error() {
Expand Down
4 changes: 2 additions & 2 deletions ExampleConfigurationFiles/Baseline-BasicExample.mobileconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<array>
<dict>
<key>DisplayName</key>
<string>Google Chrome</string>
<string>Firefox</string>
<key>Label</key>
<string>googlechromepkg</string>
<string>firefoxpkg</string>
</dict>
<dict>
<key>DisplayName</key>
Expand Down
4 changes: 2 additions & 2 deletions ExampleConfigurationFiles/Baseline-ProductionExample.mobileconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<array>
<dict>
<key>DisplayName</key>
<string>Google Chrome</string>
<string>Firefox</string>
<key>Icon</key>
<string>ExampleIcon.png</string>
<key>Label</key>
<string>googlechromepkg</string>
<string>firefoxpkg</string>
</dict>
<dict>
<key>DisplayName</key>
Expand Down
4 changes: 2 additions & 2 deletions ExampleConfigurationFiles/BaselineConfig.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<array>
<dict>
<key>DisplayName</key>
<string>Google Chrome</string>
<string>Firefox</string>
<key>Label</key>
<string>googlechromepkg</string>
<string>firefoxpkg</string>
</dict>
<dict>
<key>DisplayName</key>
Expand Down
109 changes: 101 additions & 8 deletions ProfileManifest/com.secondsonconsulting.baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@
"type": "string",
"title": "Arguments",
"description": "Arguments you want to pass to the Installomator command for this label."
},
"Icon": {
"type": "string",
"title": "Icon",
"description": "The icon you want to appear in the SwiftDialog menu as this Installomator label is processed. Can be a URL or local file path."
},
"Subtitle": {
"type": "string",
"title": "Subtitle",
"description": "The subtitle text to appear on this line item."
}
}
},
Expand Down Expand Up @@ -88,6 +98,16 @@
"type": "string",
"title": "Arguments",
"description": "Arguments you want to pass to the installer command for this package."
},
"Icon": {
"type": "string",
"title": "Icon",
"description": "The icon you want to appear in the SwiftDialog menu as this package is installed. Can be a URL or local file path."
},
"Subtitle": {
"type": "string",
"title": "Subtitle",
"description": "The subtitle text to appear on this line item."
}
}
},
Expand Down Expand Up @@ -119,6 +139,16 @@
"type": "string",
"title": "Arguments",
"description": "Arguments you want to pass to the script when it is run."
},
"Icon": {
"type": "string",
"title": "Icon",
"description": "The icon you want to appear in the SwiftDialog menu as this script is run. Can be a URL or local file path."
},
"Subtitle": {
"type": "string",
"title": "Subtitle",
"description": "The subtitle text to appear on this line item."
}
}
},
Expand All @@ -128,39 +158,102 @@
},
"Restart": {
"type": "boolean",
"title": "Restart",
"description": "This setting controls whether Baseline forces a restart after completion. Default is true.",
"title": "Force Restart",
"default": true,
"description": "This setting controls whether Baseline forces a restart after completion.",
"property_order": 25
},
"LogOut": {
"type": "boolean",
"title": "Force Log Out",
"default": false,
"description": "This setting controls whether Baseline forces a restart after completion.",
"property_order": 30
},
"BlurScreen": {
"type": "boolean",
"title": "Blur Screen",
"default": true,
"description": "This setting controls whether Baseline uses the SwiftDialog --blurscreen feature. Default is true. If you set to false, consider using --ontop in your DialogListOptions key",
"property_order": 35
},
"ProgressBar": {
"type": "boolean",
"title": "Show Progress Bar",
"default": false,
"description": "This setting controls whether Baseline displays a progress bar.",
"property_order": 40
},
"ProgressBarDisplayNames": {
"type": "boolean",
"title": "Show Display Names on Progress Bar",
"default": false,
"description": "This setting controls whether Baseline displays the current item being processed under the progress bar.",
"property_order": 45
},
"CleanupAfterUse": {
"type": "boolean",
"title": "Cleanup After Use",
"description": "This setting controls whether Baseline forces a restart after completion. Default is true.",
"property_order": 30
"default": true,
"description": "This setting controls whether Baseline deletes it's install directory after use: /usr/local/Baseline.",
"property_order": 50
},
"ReinstallDialog": {
"type": "boolean",
"title": "Reinstall SwiftDialog",
"description": "This setting controls whether Baseline will reinstall SwiftDialog as the final step before completion. Default behavior if this key is omitted will reinstall SwiftDialog if a custom PNG is found in /Library/Application Support/Dialog/Dialog.png.",
"property_order": 55
},
"InstallomatorSwiftDialogIntegration": {
"type": "boolean",
"title": "Use Installomator SwiftDialog Integration",
"default": false,
"description": "Tell Installomator to use it's built in SwiftDialog integration for the List View.",
"property_order": 60
},
"IgnoreDefaultInstallomatorOptions": {
"type": "boolean",
"title": "Ignore Default Installomator Options",
"default": false,
"description": "By default, Baseline uses \"NOTIFY=silent\" and \"BLOCKING_PROCESS_ACTION=kill\" Installomator options. Setting this to True means Baseline will not use those options.",
"property_order": 65
},
"Button1Enabled": {
"type": "boolean",
"title": "Button 1 Enabled",
"default": false,
"description": "This setting enables SwiftDialog \"Button 1\" (the OK button) on the Baseline List View. This allows users to dismiss the list view and continue working while Baseline runs. By default this button is disabled.",
"property_order": 70
},
"DialogListOptions": {
"type": "string",
"title": "Dialog List Window Options",
"description": "SwiftDialog options for the primary Baseline progress list window.",
"property_order": 35
"property_order": 75
},
"DialogSuccessOptions": {
"type": "string",
"title": "Dialog Success Window Options",
"description": "SwiftDialog options for the Success Dialog window.",
"property_order": 40
"property_order": 80
},
"DialogFailureOptions": {
"type": "string",
"title": "Dialog Failure Window Options",
"description": "SwiftDialog options for the Failure Dialog window.",
"property_order": 45
"property_order": 85
},
"ExitCondition": {
"type": "string",
"title": "Exit Condition",
"description": "Define a file or folder path. If this file or folder exists, Baseline will exit quietly without processing any items.",
"property_order": 50
"property_order": 90
},
"BailOutFile": {
"type": "string",
"title": "Bail Out File",
"description": "Define a file path. If this file exists at any point while Baseline is running, Baseline will exit and will not process additional items.",
"property_order": 95
}
}
}
34 changes: 32 additions & 2 deletions ProfileManifest/com.secondsonconsulting.baseline.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>pfm_format_version</key>
<integer>1</integer>
<key>pfm_last_modified</key>
<date>2024-01-24T00:00:00Z</date>
<date>2024-03-03T00:00:00Z</date>
<key>pfm_platforms</key>
<array>
<string>macOS</string>
Expand Down Expand Up @@ -235,6 +235,16 @@ A profile can consist of payloads with different version numbers. For example, c
<key>pfm_type</key>
<string>string</string>
</dict>
<dict>
<key>pfm_description</key>
<string>The subtitle text to appear on this line item.</string>
<key>pfm_name</key>
<string>Subtitle</string>
<key>pfm_title</key>
<string>Subtitle</string>
<key>pfm_type</key>
<string>string</string>
</dict>
</array>
<key>pfm_type</key>
<string>dictionary</string>
Expand Down Expand Up @@ -315,6 +325,16 @@ A profile can consist of payloads with different version numbers. For example, c
<key>pfm_type</key>
<string>string</string>
</dict>
<dict>
<key>pfm_description</key>
<string>The subtitle text to appear on this line item.</string>
<key>pfm_name</key>
<string>Subtitle</string>
<key>pfm_title</key>
<string>Subtitle</string>
<key>pfm_type</key>
<string>string</string>
</dict>
</array>
<key>pfm_type</key>
<string>dictionary</string>
Expand Down Expand Up @@ -385,6 +405,16 @@ A profile can consist of payloads with different version numbers. For example, c
<key>pfm_type</key>
<string>string</string>
</dict>
<dict>
<key>pfm_description</key>
<string>The subtitle text to appear on this line item.</string>
<key>pfm_name</key>
<string>Subtitle</string>
<key>pfm_title</key>
<string>Subtitle</string>
<key>pfm_type</key>
<string>string</string>
</dict>
</array>
<key>pfm_type</key>
<string>dictionary</string>
Expand Down Expand Up @@ -573,6 +603,6 @@ A profile can consist of payloads with different version numbers. For example, c
<key>pfm_unique</key>
<true/>
<key>pfm_version</key>
<integer>2</integer>
<integer>3</integer>
</dict>
</plist>

0 comments on commit d1fba34

Please sign in to comment.