Commented out vscode plugin installs via software.yml and changed timeout on macOS system updates

This commit is contained in:
Brian Zalewski 2023-08-18 00:55:27 -04:00 committed by GitHub
parent 5df352de06
commit eeb1730f17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions

View file

@ -6,6 +6,10 @@
# This script ensures macOS has tools like `git` by installing the Xcode command-line developer tools if they are # This script ensures macOS has tools like `git` by installing the Xcode command-line developer tools if they are
# not already installed. Then, on both Linux and macOS, it ensures Homebrew is installed. # not already installed. Then, on both Linux and macOS, it ensures Homebrew is installed.
# #
# ## Environment Variables
#
# * `NO_RESTART` - Set this variable to skip restarts triggered by system updates on macOS
#
# ## Homebrew Requirement # ## Homebrew Requirement
# #
# Install Doctor relies on Homebrew for many tools that are currently only available via Homebrew. Removing the dependency # Install Doctor relies on Homebrew for many tools that are currently only available via Homebrew. Removing the dependency
@ -48,7 +52,7 @@ if [ -d /Applications ] && [ -d /Library ] && [ -z "$NO_RESTART" ]; then
if command -v gtimeout > /dev/null; then if command -v gtimeout > /dev/null; then
# Allow 8 minutes for system updates # Allow 8 minutes for system updates
logg info 'Ensuring system software is upgraded (timing out after 8 minutes if system upgrade fails)' logg info 'Ensuring system software is upgraded (timing out after 8 minutes if system upgrade fails)'
sudo gtimeout 480 softwareupdate -i -a -R || logg warn 'The system update command timed out after 8 minutes' sudo gtimeout 3000 softwareupdate -i -a -R || logg warn 'The system update command timed out after 50 minutes'
else else
# If gtimeout is unavailable, then attempt system upgrade without a timeout (which usually works on fresh systems) # If gtimeout is unavailable, then attempt system upgrade without a timeout (which usually works on fresh systems)
logg info 'Applying OS upgrades (if available)' logg info 'Applying OS upgrades (if available)'

View file

@ -10934,7 +10934,7 @@ softwarePlugins:
- twitter - twitter
update: steampipe plugin update --all update: steampipe plugin update --all
teams: teams:
cmd: cmd: echo "Teams plugins are installed via the Teams app"
plugins: plugins:
- name: Pieces - name: Pieces
plugin: https://teams.microsoft.com/l/app/789f23b3-d882-45ca-b3a3-de7f850656ea plugin: https://teams.microsoft.com/l/app/789f23b3-d882-45ca-b3a3-de7f850656ea
@ -10962,11 +10962,12 @@ softwarePlugins:
- GitHub.copilotvs - GitHub.copilotvs
- TemplateStudio.TemplateStudioForWinUICs - TemplateStudio.TemplateStudioForWinUICs
- lepo.wpf-ui - lepo.wpf-ui
vscode:: # Handled by script that looks at ~/.config/Code/extensions.json
cmd: bash -c 'if ! code --list-extensions | grep "{PLUGIN}" > /dev/null; then code --install-extension "{PLUGIN}"; fi' # vscode:
plugins: # cmd: bash -c 'if ! code --list-extensions | grep "{PLUGIN}" > /dev/null; then code --install-extension "{PLUGIN}"; fi'
- GitHub.copilot # plugins:
vscodium: # - GitHub.copilot
cmd: bash -c 'if ! codium --list-extensions | grep "{PLUGIN}" > /dev/null; then codium --install-extension "{PLUGIN}"; fi' # vscodium:
plugins: # cmd: bash -c 'if ! codium --list-extensions | grep "{PLUGIN}" > /dev/null; then codium --install-extension "{PLUGIN}"; fi'
- GitHub.copilot # plugins:
# - GitHub.copilot