Feature/mac updates (#32)

* fix pyenv on mac, add coreutils to bootstrap

* ignore privs app check errors

* re-add k9s, fix some weirdness, update gitconfig to include pull block

Co-authored-by: Dave <dave.benedic@insight.com>

Author: daveyb

roles/bootstrap/tasks/darwin.yml

@@ -36,7 +36,10 @@
         path: /usr/local/homebrew
       register: homebrew
 
-    - shell: rm -rf /usr/local/homebrew
+    - name: rm -rf /usr/local/homebrew
+      file:
+        path: /usr/local/homebrew
+        state: absent
       when: homebrew.stat.exists
       become: yes
 
@@ -51,6 +54,19 @@
 
     - shell: cd /usr/local/src && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C /usr/local/homebrew
 
+    - name: check if man8 file exists
+      stat:
+        path: /usr/local/share/man/man8
+      register: man8
+      ignore_errors: yes
+
+    - name: change ownership on man8
+      file:
+        path: /usr/local/share/man/man8
+        owner: "{{ ansible_user_id }}"
+      when: man8.stat.exists
+      become: yes
+
 - name: add homebrew binaries to path
   copy:
     dest: "/Users/{{ ansible_user_id }}/.profile"
@@ -60,6 +76,11 @@
   homebrew:
     update_homebrew: yes
 
+- name: install coreutils
+  homebrew:
+    name: coreutils
+    state: latest
+
 - name: install jq
   homebrew:
     name: jq

roles/git/templates/gitconfig.j2

@@ -35,3 +35,5 @@
   pager = cat
 [push]
   default = upstream
+[pull]
+  rebase = false

roles/misc/tasks/darwin.yml

@@ -22,10 +22,10 @@
     name: kubernetes-cli
     state: latest
 
-      #- name: install k9s
-      #  homebrew:
-      #    name: derailed/k9s/k9s
-      #    state: latest
+- name: install k9s
+  homebrew:
+    name: k9s
+    state: latest
 
 - name: install kubectx
   homebrew:
@@ -45,6 +45,7 @@
 - name: check if privileges cli app is installed (corporate nanny)
   command: /Applications/Privileges.app/Contents/Resources/PrivilegesCLI --help
   register: privs_install_check
+  ignore_errors: yes
 
 - name: add privileges app alias
   lineinfile:

roles/python/tasks/darwin.yml

@@ -1,14 +1,14 @@
 ---
-#- name: shim pyenv into ~/.profile
-#  lineinfile:
-#    path: "/Users/{{ ansible_user_id }}/.profile"
-#    line: "export PATH=${PATH}:$(pyenv root)/shims"
-#    regexp: "^export PATH=${PATH}"
-#
-#- name: Add pyenv to .profile
-#  lineinfile:
-#    dest: "/Users/{{ ansible_user_id }}/.profile"
-#    line: 'eval "$(pyenv init -)"'
+- name: shim pyenv into ~/.profile
+  lineinfile:
+    path: "/Users/{{ ansible_user_id }}/.profile"
+    line: "export PATH=${PATH}:$(pyenv root)/shims"
+    regexp: "^export PATH=${PATH}"
+
+- name: Add pyenv to .profile
+  lineinfile:
+    dest: "/Users/{{ ansible_user_id }}/.profile"
+    line: 'eval "$(pyenv init -)"'
 
 # NOTE: CFLAGS="-I$(xcrun --show-sdk-path)/usr/include" pyenv install 3.7.3
 # If you're getting compilation errors caused by xcode cli tools

roles/term/tasks/darwin.yml

@@ -1,8 +1,4 @@
 ---
-- name: install iterm2
-  shell: brew cask install iterm2
-  ignore_errors: yes
-
 - name: install zsh syntax highlighting
   homebrew:
     name: zsh-syntax-highlighting