From 30df2d5faf12a9863673741e28a59f7aa65e72ce Mon Sep 17 00:00:00 2001
From: Keule2 <pk@pkcore.de>
Date: Sun, 2 Jun 2024 18:40:41 +0200
Subject: [PATCH] Fixed set shell

---
 main.yml                  | 12 ++++++++++++
 roles/fish/tasks/main.yml |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/main.yml b/main.yml
index 9bf962a..493f752 100644
--- a/main.yml
+++ b/main.yml
@@ -3,6 +3,18 @@
   hosts: localhost
   connection: local
   tasks:
+    - name: Get username
+      command: whoami
+      register: whoami
+      tags:
+        - always
+
+    - name: Set username
+      set_fact:
+        username: "{{ whoami.stdout }}"
+      tags:
+        - always
+
     - name: Set default roles
       set_fact:
         roles: "{{ ansible_run_tags != ['all'] and ansible_run_tags or default_roles | difference(ansible_skip_tags | default([])) }}"
diff --git a/roles/fish/tasks/main.yml b/roles/fish/tasks/main.yml
index b75e297..e0acdd5 100644
--- a/roles/fish/tasks/main.yml
+++ b/roles/fish/tasks/main.yml
@@ -20,6 +20,6 @@
 
 - name: "[Fish] Set shell"
   ansible.builtin.shell:
-    cmd: "sudo usermod -s $(which fish) $(whoami)"
+    cmd: "sudo usermod -s $(which fish) {{ username }}"
   become: true
   ignore_errors: true