Merge branch 'master' of github.com:HariSekhon/DevOps-Bash-tools

Makefile

@@ -101,8 +101,10 @@ init: git
 .PHONY: install
 install: build
 	@$(MAKE) link
-	@$(MAKE) aws gcp
-	@$(MAKE) github-cli pip
+	@$(MAKE) aws
+	@$(MAKE) gcp
+	@$(MAKE) github-cli
+	@$(MAKE) pip
 
 .PHONY: uninstall
 uninstall: unlink
@@ -185,6 +187,8 @@ homebrew: system-packages brew
 
 .PHONY: brew
 brew:
+	which -a brew || install/install_homebrew.sh
+	which -a wget || brew install wget
 	NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/packages/brew_install_packages_if_absent.sh setup/brew-packages-desktop.txt
 	NO_FAIL=1 NO_UPDATE=1 CASK=1 $(BASH_TOOLS)/packages/brew_install_packages_if_absent.sh setup/brew-packages-desktop-casks.txt
 	@# doesn't pass the packages correctly yet

Makefile.in

@@ -21,7 +21,7 @@ endif
 # would fail bootstrapping on Alpine
 #SHELL := /usr/bin/env bash
 
-export PATH := $(PATH):/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+export PATH := $(PATH):/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/opt/homebrew/bin
 
 DOCKER_IMAGE := harisekhon/github
 
@@ -281,7 +281,9 @@ system-packages: submodules
 	if [ -x /usr/bin/apt-get ]; then $(MAKE) apt-packages; fi
 	@# /usr/bin/yum is a symlink to dnf-3 on newer RHEL systems, so fails -x /usr/bin/yum
 	if [ -e /usr/bin/yum ];     then $(MAKE) yum-packages; fi
-	if which brew && [ `uname` = Darwin ]; then $(MAKE) homebrew-packages; fi
+	@# /usr/local/bin/brew    on older macOS
+	@# /opt/homebrew/bin/brew on newer macOS
+	if which -a brew && [ `uname` = Darwin ]; then $(MAKE) homebrew-packages; fi
 
 .PHONY: system-packages-perl
 system-packages-perl: system-packages

applescript/com.harisekhon.wakeup_script.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>com.harisekhon.wakeup_script</string>
+    <key>Program</key>
+    <string>/Users/hari/github/bash-tools/applescript/wakeup_script.sh</string>
+    <key>WatchPaths</key>
+    <array>
+      <string>/var/db/.AppleSetupDone</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+  </dict>
+</plist>

applescript/wakeup_script.sh

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#  vim:ts=4:sts=4:sw=4:et
+#
+#  Author: Hari Sekhon
+#  Date: 2024-04-17 22:26:11 +0400 (Wed, 17 Apr 2024)
+#
+#  https///github.com/HariSekhon/DevOps-Bash-tools
+#
+#  License: see accompanying Hari Sekhon LICENSE file
+#
+#  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
+#
+#  https://www.linkedin.com/in/HariSekhon
+#
+
+set -euo pipefail
+[ -n "${DEBUG:-}" ] && set -x
+srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# shellcheck disable=SC1090,SC1091
+. "$srcdir/../lib/utils.sh"
+
+# shellcheck disable=SC2034,SC2154
+usage_description="
+Script of actions to run whenever a Mac wakes up from sleep
+
+Currently this script just flushes the DNS cache to fix Chrome hitting ERR_NOT_FOUND errors when waking up on a VPN
+
+To set this up, edit the path to this script in the plist xml file and then load it:
+
+    cp -fv $srcdir/com.harisekhon.wakeup_script.plist ~/Library/LaunchAgents/
+    launchctl load $srcdir/com.harisekhon.wakeup_script.plist
+"
+
+# used by usage() in lib/utils.sh
+# shellcheck disable=SC2034
+usage_args=""
+
+help_usage "$@"
+
+num_args 0 "$@"
+
+{
+
+timestamp "Running Mac wake up script: $0"
+
+timestamp "Flushing DNS cache"
+dscacheutil -flushcache
+
+timestamp "Reloading mDNSResponder"
+sudo killall -HUP mDNSResponder
+
+timestamp "Wake up script completed"
+echo
+
+} 2>&1 | tee -a "$srcdir/wakeup_script.log"