From e7a3e611a01e3815d2d02acdb99049131f081aae Mon Sep 17 00:00:00 2001
From: pgrondek <pgrondek@gmail.com>
Date: Thu, 2 Jul 2020 12:04:22 +0200
Subject: [PATCH] Fix dwm and st

---
 roles/dwm/tasks/dwm.yml     | 26 +++++++++++++++++---------
 roles/dwm/tasks/st-term.yml | 33 ++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/roles/dwm/tasks/dwm.yml b/roles/dwm/tasks/dwm.yml
index 529bbb2..34a061c 100644
--- a/roles/dwm/tasks/dwm.yml
+++ b/roles/dwm/tasks/dwm.yml
@@ -1,5 +1,5 @@
 ---
-- name: install required packages
+- name: install required packages for dwm
   become: yes
   apt:
     update_cache: yes
@@ -14,16 +14,20 @@
       - libxcb-res0-dev
       - libx11-xcb-dev
 
-- name: checkout
-  shell:
-    cmd: |
-      mkdir -p ~/src
-      cd ~/src
-      git clone {{ dwm.repo }}
+- name: create src dir
+  file:
+    path: ~/src
+
+- name: checkout dwm
+  git:
+    repo: "{{ dwm.repo }}"
+    dest: "{{ ansible_user_dir }}/src/dwm"
+    clone: yes
+    update: yes
 
 - name: build dwm
   make:
-    chdir: ~/src/dwm
+    chdir: "{{ ansible_user_dir }}/src/dwm"
 
 - name: copy xsession
   become: yes
@@ -39,6 +43,10 @@
 
 - name: install dwm
   become: yes
+  register: make
   make:
-    chdir: ~/src/dwm
+    chdir: "{{ ansible_user_dir }}/src/dwm"
     target: install
+
+- name: debug
+  debug: msg="{{ make.stdout }}"
diff --git a/roles/dwm/tasks/st-term.yml b/roles/dwm/tasks/st-term.yml
index 99056ad..16a2e7e 100644
--- a/roles/dwm/tasks/st-term.yml
+++ b/roles/dwm/tasks/st-term.yml
@@ -1,5 +1,5 @@
 ---
-- name: install required packages
+- name: install required packages for st
   become: yes
   apt:
     update_cache: yes
@@ -7,24 +7,27 @@
       - git
       - make
 
-- name: checkout
-  shell:
-    cmd: |
-      mkdir -p ~/src
-      cd ~/src
-      git clone {{ st.repo }}
+- name: create src dir
+  file:
+    path: ~/src
+
+- name: checkout st
+  git:
+    repo: "{{ st.repo }}"
+    dest: "{{ ansible_user_dir }}/src/stterm"
+    clone: yes
+    update: yes
+
 - name: build st
   make:
-    chdir: ~/src/stterm
-
-- name: copy icon
-  become: yes
-  copy:
-    src: usr/share/icons/dwm.png
-    dest: /usr/share/icons/dwm.png
+    chdir: "{{ ansible_user_dir }}/src/stterm"
 
 - name: install st
   become: yes
+  register: make
   make:
-    chdir: ~/src/stterm
+    chdir: "{{ ansible_user_dir }}/src/stterm"
     target: install
+
+- name: debug
+  debug: msg="{{ make.stdout }}"