From bbcce1430ae6014ab61c88b1675dbdba6338e0c5 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Mon, 13 Nov 2023 07:47:43 +0000 Subject: [PATCH] Latest --- .../universal/run_before_01-system-homebrew.sh.tmpl | 4 +++- .../universal/run_onchange_before_11-install-docker.sh.tmpl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl b/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl index e9e17947..94456f9d 100644 --- a/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_before_01-system-homebrew.sh.tmpl @@ -53,7 +53,9 @@ fi ### System upgrade on macOS if [ -d /Applications ] && [ -d /Library ] && [ -z "$NO_RESTART" ]; then - echo 'bash <(curl -sSL https://install.doctor/start) # TEMPORARY FOR INSTALL DOCTOR MACOS' >> "$HOME/.zshrc" + if ! cat "$HOME/.zshrc" | grep '# TEMPORARY FOR INSTALL DOCTOR MACOS' > /dev/null; then + echo 'bash <(curl -sSL https://install.doctor/start) # TEMPORARY FOR INSTALL DOCTOR MACOS' >> "$HOME/.zshrc" + fi # TODO - Section below attempts to add timeout to macOS softwareupdate command but is failing to prompt for password (which is required even with /etc/sudoers set up # if command -v gtimeout > /dev/null; then # logg info 'Ensuring system software is upgraded (timing out after 50 minutes if system upgrade fails)' diff --git a/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl index a21fbedc..4067cd90 100644 --- a/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl @@ -27,7 +27,9 @@ if [ -d /Applications ] && [ -d /System ]; then logg info 'Docker appears to be installed already' fi logg info 'Opening the Docker for Desktop app so that the Docker engine starts running' - open --background -a Docker --args --accept-license --unattended --install-privileged-components + # TODO - --install-privileged-components may be necessary for `docker extension` command but it causes the command to no longer work + # open --background -a Docker --args --accept-license --unattended --install-privileged-components + open --background -a Docker --args --accept-license --unattended elif command -v apt-get > /dev/null; then . /etc/os-release if [ "$ID" == 'ubuntu' ]; then