From f3127405afd59da7fa8b14838b9a9cecf03b5566 Mon Sep 17 00:00:00 2001
From: pgrondek <pgrondek@gmail.com>
Date: Wed, 1 Jul 2020 16:42:35 +0200
Subject: [PATCH] Fix scripts

---
 install.sh                               |  2 +-
 roles/docker/tasks/install-docker-io.yml |  2 +-
 roles/dwm/tasks/dwm.yml                  |  2 +-
 roles/dwm/tasks/setup.yml                | 11 +++++------
 roles/dwm/tasks/st-term.yml              |  2 +-
 roles/dwm/vars/main.yml                  |  6 ++++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/install.sh b/install.sh
index 455c0de..cb711bd 100755
--- a/install.sh
+++ b/install.sh
@@ -9,4 +9,4 @@ fi
 apt update
 apt install software-properties-common
 apt-add-repository --yes --update ppa:ansible/ansible
-apt install ansible
+apt install -y git ansible
diff --git a/roles/docker/tasks/install-docker-io.yml b/roles/docker/tasks/install-docker-io.yml
index 86a150d..7d49353 100644
--- a/roles/docker/tasks/install-docker-io.yml
+++ b/roles/docker/tasks/install-docker-io.yml
@@ -15,5 +15,5 @@
 
 - name: add current user to docker group
   user:
-    name: {{ ansible_user_id }}
+    name: "{{ ansible_user_id }}"
     groups: docker
diff --git a/roles/dwm/tasks/dwm.yml b/roles/dwm/tasks/dwm.yml
index 10694e4..8767126 100644
--- a/roles/dwm/tasks/dwm.yml
+++ b/roles/dwm/tasks/dwm.yml
@@ -17,7 +17,7 @@
     cmd: |
       mkdir -p ~/src
       cd ~/src
-      git clone {{ dwm-repo }}
+      git clone {{ dwm.repo }}
 
 - name: build dwm
   make:
diff --git a/roles/dwm/tasks/setup.yml b/roles/dwm/tasks/setup.yml
index b60e7be..d9220cf 100644
--- a/roles/dwm/tasks/setup.yml
+++ b/roles/dwm/tasks/setup.yml
@@ -1,8 +1,7 @@
 ---
-- block:
+- name: install screen locker
   become: yes
-  - name: install screen locker
-    apt:
-      update_cache: yes
-      pkg:
-        - i3lock
+  apt:
+    update_cache: yes
+    pkg:
+      - i3lock
diff --git a/roles/dwm/tasks/st-term.yml b/roles/dwm/tasks/st-term.yml
index 6e5828b..4561cc7 100644
--- a/roles/dwm/tasks/st-term.yml
+++ b/roles/dwm/tasks/st-term.yml
@@ -12,7 +12,7 @@
     cmd: |
       mkdir -p ~/src
       cd ~/src
-      git clone {{ st-repo }}
+      git clone {{ st.repo }}
 
 - name: build st
   make:
diff --git a/roles/dwm/vars/main.yml b/roles/dwm/vars/main.yml
index 093d896..0bcf2db 100644
--- a/roles/dwm/vars/main.yml
+++ b/roles/dwm/vars/main.yml
@@ -1,3 +1,5 @@
 ---
-dwm-repo: https://github.com/pgrondek/dwm.git
-st-repo: https://github.com/pgrondek/stterm.git
+dwm:
+  repo: https://github.com/pgrondek/dwm.git
+st:
+  repo: https://github.com/pgrondek/stterm.git