From 00576156d432443e12094e87dd829e9e621d8e80 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 24 Nov 2022 20:30:14 +0000 Subject: [PATCH] Update dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl --- .../darwin/run_onchange_after_10_configure-macos.tmpl | 5 +++-- .../darwin/run_onchange_after_20-ensure-zsh-macos.tmpl | 7 +------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl index 5f57883a..28afc994 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl @@ -5,7 +5,7 @@ set -x # Required for PATHs (including logging) source "$HOME/.config/shell/exports" -logg 'Applying power user optimized macOS settings' +logg 'Applying optimized macOS settings' # Close any open System Preferences panes, to prevent them from overriding # settings we’re about to change @@ -937,4 +937,5 @@ for app in "Activity Monitor" \ killall "${app}" &> /dev/null done -logg success "Done. Note that some of these changes require a logout/restart to take effect." +logg 'Done applying macOS settings' +logg info 'Some of these changes may require a logout/restart to take effect' diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl index 1389a66a..17791878 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl @@ -1,14 +1,10 @@ #!/usr/bin/env bash -{{- if eq .host.distro.id "darwin" }} - -set -eufo pipefail # Required for PATHs (including logging) source "$HOME/.config/shell/exports" -logg 'Ensuring ZSH is set as the default shell' - {{- if (not .host.restricted) }} +logg 'Ensuring ZSH is set as the default shell' if ! grep -qc "/usr/local/bin/zsh" /etc/shells; then echo "/usr/local/bin/zsh" | sudo tee -a /etc/shells > /dev/null fi @@ -18,5 +14,4 @@ if [[ ! -e /usr/local/bin/zsh ]]; then sudo ln -sf /opt/homebrew/bin/zsh /usr/local/bin/zsh fi {{- end -}} -{{- end -}} {{- end }}