From 645886a40e9e4ef96c98d92c02033db511f18ba8 Mon Sep 17 00:00:00 2001
From: Daniel Tomlinson <dtomlinson@panaetius.co.uk>
Date: Fri, 5 Mar 2021 23:06:29 +0000
Subject: [PATCH] updating roles

---
 roles/cleanup/tasks/main.yml |  1 -
 roles/go/tasks/main.yml      |  2 +-
 roles/mac/tasks/main.yml     | 14 ++++++++++++++
 roles/python/tasks/main.yml  |  2 +-
 roles/shell/tasks/main.yml   | 12 ++++++------
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/roles/cleanup/tasks/main.yml b/roles/cleanup/tasks/main.yml
index 9d904ac..a4a0d68 100644
--- a/roles/cleanup/tasks/main.yml
+++ b/roles/cleanup/tasks/main.yml
@@ -1,5 +1,4 @@
 - name: Remove temporary directory
-  tags: always
   file:
     path: "{{ temp_install_dir.path }}"
     state: absent
diff --git a/roles/go/tasks/main.yml b/roles/go/tasks/main.yml
index 6363388..5ad107f 100644
--- a/roles/go/tasks/main.yml
+++ b/roles/go/tasks/main.yml
@@ -15,4 +15,4 @@
         state: directory
         recurse: true
         owner: "{{ default_user }}"
-        group: "{{ default_user }}"
+        group: "{{ default_user_group }}"
diff --git a/roles/mac/tasks/main.yml b/roles/mac/tasks/main.yml
index d69543f..8673f04 100644
--- a/roles/mac/tasks/main.yml
+++ b/roles/mac/tasks/main.yml
@@ -2,7 +2,21 @@
 - name: Tasks for configuring MacOS
   tags: [mac]
   block:
+    - name: Get default user home
+      user:
+        name: "{{ default_user }}"
+        state: present
+      register: default_user_details
+    - name: Set default user home
+      set_fact:
+        default_user_home: "{{ default_user_details.home }}"
+    - name: print home dir on mac
+      debug:
+        var: default_user_home
     - name: Install command line tools
       include_role:
         name: elliotweiser.osx-command-line-tools
+    - name: Install and configure Homebrew
+      include_role:
+        name: geerlingguy.homebrew
 ...
diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml
index 9d3985a..c0c78d4 100644
--- a/roles/python/tasks/main.yml
+++ b/roles/python/tasks/main.yml
@@ -22,7 +22,7 @@
         creates: "{{ default_user_home }}/.local/bin/pipx"
 
     - name: Install pipx packages
-      shell: "{{ default_user_home }}/.local/bin/pipx install {{ item }}"
+      shell: "{{ default_user_home }}/.local/bin/pipx install {{ item }} --force"
       loop: "{{ pipx_packages }}"
 
     - name: Install Poetry
diff --git a/roles/shell/tasks/main.yml b/roles/shell/tasks/main.yml
index c93b64f..bd5e7e4 100644
--- a/roles/shell/tasks/main.yml
+++ b/roles/shell/tasks/main.yml
@@ -9,12 +9,12 @@
         database: passwd
         key: "{{ default_user }}"
         split: ":"
-      tags: always
+      when: target_system == "linux"
 
     - name: Set default user home
       set_fact:
         default_user_home: "{{ getent_passwd[default_user][4] }}"
-      tags: always
+      when: target_system == "linux"
 
     - name: Install and configure default user environment
       become: true
@@ -25,13 +25,13 @@
             src: .tmux.conf
             dest: "{{ default_user_home }}/.tmux.conf"
             owner: "{{ default_user }}"
-            group: "{{default_user}}"
+            group: "{{ default_user_group }}"
             force: yes
             mode: 0644
 
         - name: Create temporary install directory
           tempfile:
-            path: "/home/{{ default_user }}"
+            path: "{{ default_user_home }}"
             state: directory
             suffix: .tmp
           register: temp_install_dir
@@ -77,7 +77,7 @@
             src: .zshrc.j2
             dest: "{{ default_user_home }}/.zshrc"
             owner: "{{ default_user }}"
-            group: "{{ default_user }}"
+            group: "{{ default_user_group }}"
             force: yes
             mode: 0644
 
@@ -86,6 +86,6 @@
             src: .p10k.zsh
             dest: "{{ default_user_home }}/.p10k.zsh"
             owner: "{{ default_user }}"
-            group: "{{default_user}}"
+            group: "{{ default_user_group }}"
             force: yes
             mode: 0644