fix(init): pull dotfiles in bootstrap before running setup script

The merge --ff-only fix in common.sh cannot take effect when the local
dotfiles are at an older commit that predates the fix (chicken-and-egg).
Since bootstrap is always fetched fresh from GitHub, pulling here
guarantees the setup script and Brewfiles are up to date.

Author: ebkn

bin/init/bootstrap-macos.sh

@@ -27,10 +27,14 @@ if [ "$(uname -m)" = "arm64" ] && ! /usr/bin/pgrep -q oahd; then
   sudo softwareupdate --install-rosetta --agree-to-license
 fi
 
-# Clone dotfiles if missing.
+# Clone or update dotfiles so macos.sh always runs the latest code.
 if [ ! -d "$DOTFILES_DIR" ]; then
   printf "Cloning dotfiles...\n"
   git clone https://github.com/ebkn/dotfiles "$DOTFILES_DIR"
+else
+  printf "Updating dotfiles...\n"
+  git -C "$DOTFILES_DIR" fetch --all --prune
+  git -C "$DOTFILES_DIR" merge --ff-only || printf "warning: could not fast-forward dotfiles\n" >&2
 fi
 
 exec zsh "${DOTFILES_DIR}/bin/init/macos.sh"

bin/init/bootstrap-ubuntu.sh

@@ -18,10 +18,14 @@ if ! command -v git >/dev/null 2>&1; then
   sudo apt install -y git
 fi
 
-# Clone dotfiles if missing.
+# Clone or update dotfiles so ubuntu.sh always runs the latest code.
 if [ ! -d "$DOTFILES_DIR" ]; then
   printf "Cloning dotfiles...\n"
   git clone https://github.com/ebkn/dotfiles "$DOTFILES_DIR"
+else
+  printf "Updating dotfiles...\n"
+  git -C "$DOTFILES_DIR" fetch --all --prune
+  git -C "$DOTFILES_DIR" merge --ff-only || printf "warning: could not fast-forward dotfiles\n" >&2
 fi
 
 exec bash "${DOTFILES_DIR}/bin/init/ubuntu.sh"