From 804eb020757bef07d07c9351542b880f3753deb7 Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Sat, 2 Mar 2024 22:32:44 +0100
Subject: [PATCH] fix: suppoer relative and absolute paths

---
 defaults/default.yml           |  2 +-
 tasks/create_shell_rc_file.yml | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/defaults/default.yml b/defaults/default.yml
index 281c1c1..e0892d4 100644
--- a/defaults/default.yml
+++ b/defaults/default.yml
@@ -26,7 +26,7 @@ unix_users: {}
 #     btrfs: false
 #     shell: /bin/bash
 #     shell_rc_files:
-#     - file: "/home/alice/.bashrc.d"
+#     - file: "/home/alice/.bashrc.d/docker.bashrc" # absolute or relative path to home dir
 #       aliases:
 #       - key: "dcd"
 #         value: "docker-compose down"
diff --git a/tasks/create_shell_rc_file.yml b/tasks/create_shell_rc_file.yml
index 937e1aa..0607578 100644
--- a/tasks/create_shell_rc_file.yml
+++ b/tasks/create_shell_rc_file.yml
@@ -1,25 +1,30 @@
 ---
 
-- name: "Create shell rc file directory {{ shell_rc_file.file | dirname }}"
+- name: "Determine shell rc directory"
+  ansible.builtin.set_fact:
+    # path_join examples: https://docs.ansible.com/ansible/latest/collections/ansible/builtin/path_join_filter.html#examples
+    _shell_rc_file: "{{ (user_user_home, '.bashrc.d', shell_rc_file.file) | path_join }}"
+
+- name: "Create shell rc directory: {{ _shell_rc_file | dirname }}"
   ansible.builtin.file:
-    path: "{{ shell_rc_file.file | dirname }}"
+    path: "{{ _shell_rc_file | dirname }}"
     owner: "{{ unix_user.key }}"
     group: "{{ unix_user.value.group | default('users') }}"
     mode: "0755"
     state: "directory"
 
-- name: "Create shell rc file {{ shell_rc_file.file }}"
+- name: "Create shell rc file: {{ _shell_rc_file }}"
   ansible.builtin.template:
     src: shell_rc_file.j2
-    dest: "{{ shell_rc_file.file }}"
+    dest: "{{ _shell_rc_file }}"
     owner: "{{ unix_user.key }}"
     group: "{{ unix_user.value.group | default('users') }}"
     mode: "0644"
 
-- name: "Source shell rc file {{ shell_rc_file.file }}"
+- name: "Source shell rc file: {{ _shell_rc_file }}"
   ansible.builtin.lineinfile:
     path: "{{ user_user_home }}/.bashrc"
-    line: "source \"{{ shell_rc_file.file }}\""
+    line: "source \"{{ _shell_rc_file }}\""
     owner: "{{ unix_user.key }}"
     group: "{{ unix_user.value.group | default('users') }}"
     state: "present"