Merge branch 'master' of git.sos.ethz.ch:ansibleroles/tmux

SOSETH · Feb 17, 2019 · 98fff4b · 98fff4b
2 parents db8c3d0 + 8e0a5f5
commit 98fff4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,23 +1,22 @@
 ---
 - set_fact:
-    powerline_packages:
+    packages:
+      - tmux
       - powerline
     when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"
 
 - set_fact:
-    powerline_packages:
+    packages:
+      - tmux
       - powerline
       - tmux-powerline
   when: ansible_distribution == "Fedora"
 
 - name: install packages
   become: True
   package:
-    name: "{{ item }}"
+    name: "{{ packages }}"
     state: present
-  with_items:
-    - tmux
-    - "{{ powerline_packages }}"
 
 - name: detect tmux version
   shell: tmux -V | cut -d ' ' -f2

diff --git a/templates/tmux.conf.j2 b/templates/tmux.conf.j2
@@ -1,6 +1,6 @@
 # Managed by ansible
 
-{% if tmux_version.stdout is version_compare('2.1', '>=') %}
+{% if tmux_version.stdout is version('2.1', '>=') %}
 # tmux {{ tmux_version.stdout }} is >= 2.1 -> new mouse handling
 set -g mouse on
 
@@ -52,7 +52,7 @@ set -g base-index 1
 setw -g pane-base-index 1
 
 # Activate Powerline. We assume that the most recent version supported in Debian's powerline package is the most recent version of tmux shipped in Debian. Powerline has it's own config...
-{% if ansible_distribution == "Debian" %}
+{% if ansible_distribution == "Debian" or ansible_distribution == "Ubuntu" %}
 source '/usr/share/powerline/bindings/tmux/powerline.conf'
 {% elif ansible_distribution == "Fedora" %}
 source '/usr/share/tmux/powerline.conf'