From b5e082e40074b9f34bfe061ec4f02d1f6877011dbf2514fad44797d1d577d7aa Mon Sep 17 00:00:00 2001 From: bryan Date: Thu, 29 Jan 2026 01:06:09 -0500 Subject: [PATCH] Add scripts to role --- .../scripts/common}/btrfs-convert | 0 .../scripts/common}/chroot-rescue | 0 .../scripts/common}/container-home-assistant | 0 {scripts => roles/scripts/common}/drive-info | 0 .../scripts/common}/estimate-musicdir | 0 {scripts => roles/scripts/common}/extract | 0 .../scripts/common}/history-clean | 0 {scripts => roles/scripts/common}/iso-to-mkv | 0 .../scripts/common}/jriver-exclusions.ps1 | 0 .../scripts/common}/jriver-expressions.txt | 0 .../scripts/common}/jriver-fix-date-imported | 0 .../common}/jriver-replace-date-imported | 0 {scripts => roles/scripts/common}/prune-files | 0 .../scripts/common}/random-words | 0 .../scripts/common}/remove-small-dirs | 0 .../scripts/common}/speedtest-compare | 0 {scripts => roles/scripts/common}/ssh-wrap | 0 {scripts => roles/scripts/common}/strip-exif | 0 {scripts => roles/scripts/common}/sync-music | 0 .../scripts/common}/tmux-management | 0 .../scripts/common}/tree-to-markdown | 0 .../scripts/common}/update-git-hooks | 0 roles/scripts/tasks/main.yml | 31 +++++-------------- 23 files changed, 8 insertions(+), 23 deletions(-) rename {scripts => roles/scripts/common}/btrfs-convert (100%) rename {scripts => roles/scripts/common}/chroot-rescue (100%) rename {scripts => roles/scripts/common}/container-home-assistant (100%) rename {scripts => roles/scripts/common}/drive-info (100%) rename {scripts => roles/scripts/common}/estimate-musicdir (100%) rename {scripts => roles/scripts/common}/extract (100%) rename {scripts => roles/scripts/common}/history-clean (100%) rename {scripts => roles/scripts/common}/iso-to-mkv (100%) rename {scripts => roles/scripts/common}/jriver-exclusions.ps1 (100%) rename {scripts => roles/scripts/common}/jriver-expressions.txt (100%) rename {scripts => roles/scripts/common}/jriver-fix-date-imported (100%) rename {scripts => roles/scripts/common}/jriver-replace-date-imported (100%) rename {scripts => roles/scripts/common}/prune-files (100%) rename {scripts => roles/scripts/common}/random-words (100%) rename {scripts => roles/scripts/common}/remove-small-dirs (100%) rename {scripts => roles/scripts/common}/speedtest-compare (100%) rename {scripts => roles/scripts/common}/ssh-wrap (100%) rename {scripts => roles/scripts/common}/strip-exif (100%) rename {scripts => roles/scripts/common}/sync-music (100%) rename {scripts => roles/scripts/common}/tmux-management (100%) rename {scripts => roles/scripts/common}/tree-to-markdown (100%) rename {scripts => roles/scripts/common}/update-git-hooks (100%) diff --git a/scripts/btrfs-convert b/roles/scripts/common/btrfs-convert similarity index 100% rename from scripts/btrfs-convert rename to roles/scripts/common/btrfs-convert diff --git a/scripts/chroot-rescue b/roles/scripts/common/chroot-rescue similarity index 100% rename from scripts/chroot-rescue rename to roles/scripts/common/chroot-rescue diff --git a/scripts/container-home-assistant b/roles/scripts/common/container-home-assistant similarity index 100% rename from scripts/container-home-assistant rename to roles/scripts/common/container-home-assistant diff --git a/scripts/drive-info b/roles/scripts/common/drive-info similarity index 100% rename from scripts/drive-info rename to roles/scripts/common/drive-info diff --git a/scripts/estimate-musicdir b/roles/scripts/common/estimate-musicdir similarity index 100% rename from scripts/estimate-musicdir rename to roles/scripts/common/estimate-musicdir diff --git a/scripts/extract b/roles/scripts/common/extract similarity index 100% rename from scripts/extract rename to roles/scripts/common/extract diff --git a/scripts/history-clean b/roles/scripts/common/history-clean similarity index 100% rename from scripts/history-clean rename to roles/scripts/common/history-clean diff --git a/scripts/iso-to-mkv b/roles/scripts/common/iso-to-mkv similarity index 100% rename from scripts/iso-to-mkv rename to roles/scripts/common/iso-to-mkv diff --git a/scripts/jriver-exclusions.ps1 b/roles/scripts/common/jriver-exclusions.ps1 similarity index 100% rename from scripts/jriver-exclusions.ps1 rename to roles/scripts/common/jriver-exclusions.ps1 diff --git a/scripts/jriver-expressions.txt b/roles/scripts/common/jriver-expressions.txt similarity index 100% rename from scripts/jriver-expressions.txt rename to roles/scripts/common/jriver-expressions.txt diff --git a/scripts/jriver-fix-date-imported b/roles/scripts/common/jriver-fix-date-imported similarity index 100% rename from scripts/jriver-fix-date-imported rename to roles/scripts/common/jriver-fix-date-imported diff --git a/scripts/jriver-replace-date-imported b/roles/scripts/common/jriver-replace-date-imported similarity index 100% rename from scripts/jriver-replace-date-imported rename to roles/scripts/common/jriver-replace-date-imported diff --git a/scripts/prune-files b/roles/scripts/common/prune-files similarity index 100% rename from scripts/prune-files rename to roles/scripts/common/prune-files diff --git a/scripts/random-words b/roles/scripts/common/random-words similarity index 100% rename from scripts/random-words rename to roles/scripts/common/random-words diff --git a/scripts/remove-small-dirs b/roles/scripts/common/remove-small-dirs similarity index 100% rename from scripts/remove-small-dirs rename to roles/scripts/common/remove-small-dirs diff --git a/scripts/speedtest-compare b/roles/scripts/common/speedtest-compare similarity index 100% rename from scripts/speedtest-compare rename to roles/scripts/common/speedtest-compare diff --git a/scripts/ssh-wrap b/roles/scripts/common/ssh-wrap similarity index 100% rename from scripts/ssh-wrap rename to roles/scripts/common/ssh-wrap diff --git a/scripts/strip-exif b/roles/scripts/common/strip-exif similarity index 100% rename from scripts/strip-exif rename to roles/scripts/common/strip-exif diff --git a/scripts/sync-music b/roles/scripts/common/sync-music similarity index 100% rename from scripts/sync-music rename to roles/scripts/common/sync-music diff --git a/scripts/tmux-management b/roles/scripts/common/tmux-management similarity index 100% rename from scripts/tmux-management rename to roles/scripts/common/tmux-management diff --git a/scripts/tree-to-markdown b/roles/scripts/common/tree-to-markdown similarity index 100% rename from scripts/tree-to-markdown rename to roles/scripts/common/tree-to-markdown diff --git a/scripts/update-git-hooks b/roles/scripts/common/update-git-hooks similarity index 100% rename from scripts/update-git-hooks rename to roles/scripts/common/update-git-hooks diff --git a/roles/scripts/tasks/main.yml b/roles/scripts/tasks/main.yml index e0f0574..52d9fb6 100644 --- a/roles/scripts/tasks/main.yml +++ b/roles/scripts/tasks/main.yml @@ -1,25 +1,10 @@ --- -- name: Copy repo scripts to local bin (for remote hosts) - ansible.builtin.copy: - src: "{{ item }}" - dest: "{{ local_bin_dir | default(ansible_facts['env']['HOME'] ~ '/.local/bin') }}/{{ item | basename }}" - mode: "0755" - owner: "{{ local_bin_owner | default(ansible_facts['user_id']) }}" - group: "{{ local_bin_group | default(ansible_facts['user_gid']) }}" - with_fileglob: - - "{{ scripts_src_glob | default(playbook_dir + '/scripts/*') }}" - when: ansible_connection not in ['local', 'localhost'] and item is file - -- name: Symlink repo scripts into local bin (stow-like, for local hosts) - ansible.builtin.file: - src: "{{ item }}" - dest: "{{ local_bin_dir | default(ansible_facts['env']['HOME'] ~ '/.local/bin') }}/{{ item | basename }}" - state: link - force: true - owner: "{{ local_bin_owner | default(ansible_facts['user_id']) }}" - group: "{{ local_bin_group | default(ansible_facts['user_gid']) }}" - follow: false - with_fileglob: - - "{{ scripts_src_glob | default(playbook_dir + '/scripts/*') }}" - when: ansible_connection in ['local', 'localhost'] and item is file +- name: Deploy scripts to user's local bin + ansible.builtin.include_tasks: ../../deploy_files.yml + vars: + var_prefix: scripts + subdir: '' + target_root: "{{ ansible_facts.env.HOME }}/.local/bin" + use_symlinks: true + become_root: false