Merge branch 'geerlingguy:master' into master

Author: tuxpeople

.ansible-lint

@@ -1,3 +1,7 @@
+---
+exclude_paths:
+  - galaxy-deploy.yml
+  - .ansible/roles/*
 skip_list:
   - risky-file-permissions
   - yaml

.github/workflows/ci.yml

@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ansible_collections/geerlingguy/mac
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ansible_collections/geerlingguy/mac
 

.yamllint

@@ -5,6 +5,15 @@ rules:
   line-length:
     max: 180
     level: warning
+  comments:
+    min-spaces-from-content: 1
+  comments-indentation: false
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+  octal-values:
+    forbid-implicit-octal: true
+    forbid-explicit-octal: true
 
 ignore: |
   .github/stale.yml

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.14.0"
+requires_ansible: ">=2.15.0"

roles/homebrew/tasks/main.yml

@@ -5,7 +5,7 @@
     homebrew_group: '{{ homebrew_group | default(ansible_user_gid) }}'
 
 # Homebrew setup prerequisites.
-- name: Ensure Homebrew parent directory has correct permissions (M1).
+- name: Ensure Homebrew parent directory has correct permissions (Apple Silicon).
   file:
     path: "{{ homebrew_prefix }}"
     owner: "{{ homebrew_user }}"
@@ -30,7 +30,7 @@
         owner: root
         group: admin
         state: directory
-        mode: 0775
+        mode: "0775"
       become: true
       when: "ansible_distribution_version is version('10.13', '<')"
 
@@ -45,7 +45,7 @@
     owner: "{{ homebrew_user }}"
     group: "{{ homebrew_group }}"
     state: directory
-    mode: 0775
+    mode: "0775"
   become: true
 
 # Clone Homebrew.
@@ -58,6 +58,7 @@
     depth: 1
   become: true
   become_user: "{{ homebrew_user }}"
+  when: not pre_installed_brew.stat.exists
 
 # Adjust Homebrew permissions.
 - name: Ensure proper permissions and ownership on homebrew_brew_bin_path dirs.
@@ -66,7 +67,7 @@
     state: directory
     owner: "{{ homebrew_user }}"
     group: "{{ homebrew_group }}"
-    mode: 0775
+    mode: "0775"
   become: true
 
 - name: Ensure proper ownership on homebrew_install_path subdirs.
@@ -76,6 +77,7 @@
     owner: "{{ homebrew_user }}"
     group: "{{ homebrew_group }}"
     recurse: true
+    follow: false
   become: true
 
 # Place brew binary in proper location and complete setup.
@@ -198,5 +200,7 @@
       check_mode: false
 
     - name: Install from Brewfile.
-      command: "{{ homebrew_brew_bin_path }}/brew bundle chdir={{ homebrew_brewfile_dir }}"
+      command: "{{ homebrew_brew_bin_path }}/brew bundle"
+      args:
+        chdir: "{{ homebrew_brewfile_dir }}"
       when: homebrew_brewfile.stat.exists and homebrew_use_brewfile

roles/mas/README.md

@@ -38,6 +38,10 @@ A list of apps to ensure are installed on the computer using the Mac App Store.
 
 Whether to run `mas upgrade`, which will upgrade all installed Mac App Store apps.
 
+    mas_path: "{{ '/opt/homebrew/bin/mas' if ansible_architecture == 'arm64' else '/usr/local/bin/mas' }}"
+
+When targeting a remote Mac, the PATH isn't always correct leading to the `mas` binary not being found. This variable allows you to override the path to the `mas` binary. The defaults above work for most installations, but you may need to override this if you have a custom Homebrew installation path or other custom setup.
+
 ### Remove installed apps
 
     mas_uninstalled_apps:

roles/mas/defaults/main.yml

@@ -2,11 +2,12 @@
 mas_email: ""
 mas_password: ""
 mas_uninstalled_apps: []
-mas_installed_app_ids: []  # Deprecated
+mas_installed_app_ids: [] # Deprecated
 mas_installed_apps:
-  - {id: 425264550, name: "Blackmagic Disk Speed Test (3.0)"}
-  - {id: 411643860, name: "DaisyDisk (4.3.2)"}
-  - {id: 498486288, name: "Quick Resizer (1.9)"}
-  - {id: 497799835, name: "Xcode (8.1)"}
+  - { id: 425264550, name: "Blackmagic Disk Speed Test (3.0)" }
+  - { id: 411643860, name: "DaisyDisk (4.3.2)" }
+  - { id: 498486288, name: "Quick Resizer (1.9)" }
+  - { id: 497799835, name: "Xcode (8.1)" }
 mas_upgrade_all_apps: false
 mas_signin_dialog: false
+mas_path: "{{ '/opt/homebrew/bin/mas' if ansible_architecture == 'arm64' else '/usr/local/bin/mas' }}"

roles/mas/tasks/main.yml

@@ -5,7 +5,7 @@
     state: present
 
 - name: Get MAS account status
-  command: mas account
+  command: '"{{ mas_path }}" account'
   register: mas_account_result
   failed_when: mas_account_result.rc > 1
   check_mode: false
@@ -14,7 +14,7 @@
     - ansible_distribution_version is version('12', '<')
 
 - name: Sign in to MAS when email and password are provided.
-  command: 'mas signin "{{ mas_email }}" "{{ mas_password }}"'
+  command: '"{{ mas_path }}" signin "{{ mas_email }}" "{{ mas_password }}"'
   register: mas_signin_result
   when:
     - ansible_distribution_version is version('10.13', '<')
@@ -24,7 +24,7 @@
     - not mas_signin_dialog
 
 - name: Sign in to MAS when email is provided, and complete password and 2FA using dialog.
-  command: 'mas signin "{{ mas_email }}" "{{ mas_password }}" --dialog'
+  command: '"{{ mas_path }}" signin "{{ mas_email }}" "{{ mas_password }}" --dialog'
   register: mas_signin_result
   when:
     - ansible_distribution_version is version('10.13', '<')
@@ -33,21 +33,21 @@
     - mas_email is truthy
 
 - name: List installed MAS apps.
-  command: mas list
+  command: '"{{ mas_path }}" list'
   register: mas_list
   check_mode: false
   changed_when: false
 
 - name: Ensure unwanted MAS apps are uninstalled.
-  command: mas uninstall "{{ item.id | default(item) }}"
+  command: '"{{ mas_path }}" uninstall "{{ item.id | default(item) }}"'
   with_items: "{{ mas_uninstalled_apps }}"
   when: (item.id | default(item) | string) in mas_list.stdout
 
 - name: Ensure configured MAS apps are installed.
-  command: mas install "{{ item.id | default(item) }}"
+  command: '"{{ mas_path }}" install "{{ item.id | default(item) }}"'
   with_items: "{{ mas_installed_apps + mas_installed_app_ids }}"
   when: (item.id | default(item) | string) not in mas_list.stdout
 
 - name: Upgrade all apps (if configured).
-  command: mas upgrade
+  command: '"{{ mas_path }}" upgrade'
   when: mas_upgrade_all_apps