From 4d80c76c3889273ee1492a4795a5dec305d20682 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 5 Dec 2023 18:04:55 -0700
Subject: [PATCH] refactor: get_ostree_data.sh use env shebang - remove from
 .sanity*

Use the `#!/usr/bin/env bash` shebang which is ansible-test friendly.
This means we can remove get_ostree_data.sh from the .sanity* files.
This also means we can remove the .sanity* files if we do not need
them otherwise.

Rename `pth` to `path` in honor of nscott

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
---
 .ostree/get_ostree_data.sh      | 8 ++++----
 .sanity-ansible-ignore-2.10.txt | 1 -
 .sanity-ansible-ignore-2.11.txt | 1 -
 .sanity-ansible-ignore-2.12.txt | 1 -
 .sanity-ansible-ignore-2.13.txt | 1 -
 .sanity-ansible-ignore-2.14.txt | 1 -
 .sanity-ansible-ignore-2.15.txt | 1 -
 .sanity-ansible-ignore-2.9.txt  | 1 -
 8 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.ostree/get_ostree_data.sh b/.ostree/get_ostree_data.sh
index cec08b0c..65830d6b 100755
--- a/.ostree/get_ostree_data.sh
+++ b/.ostree/get_ostree_data.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 
@@ -28,7 +28,7 @@ if [ "$pkgtype" = testing ]; then
 fi
 
 get_rolepath() {
-    local ostree_dir role rolesdir roles_parent_dir coll_path pth
+    local ostree_dir role rolesdir roles_parent_dir coll_path path
     ostree_dir="$1"
     role="$2"
     roles_parent_dir="$(dirname "$(dirname "$ostree_dir")")"
@@ -51,8 +51,8 @@ get_rolepath() {
         coll_path="${ANSIBLE_COLLECTIONS_PATHS:-}"
     fi
     if [ -n "${coll_path}" ]; then
-        for pth in ${coll_path//:/ }; do
-            for rolesdir in "$pth"/ansible_collections/*/*_system_roles/roles/"$role"/.ostree; do
+        for path in ${coll_path//:/ }; do
+            for rolesdir in "$path"/ansible_collections/*/*_system_roles/roles/"$role"/.ostree; do
                 if [ -d "$rolesdir" ]; then
                     echo "$rolesdir"
                     return 0
diff --git a/.sanity-ansible-ignore-2.10.txt b/.sanity-ansible-ignore-2.10.txt
index 2d918b34..e6d5e4d6 100644
--- a/.sanity-ansible-ignore-2.10.txt
+++ b/.sanity-ansible-ignore-2.10.txt
@@ -1,2 +1 @@
 plugins/modules/timesync_provider.sh shebang
-roles/timesync/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.11.txt b/.sanity-ansible-ignore-2.11.txt
index 2d918b34..e6d5e4d6 100644
--- a/.sanity-ansible-ignore-2.11.txt
+++ b/.sanity-ansible-ignore-2.11.txt
@@ -1,2 +1 @@
 plugins/modules/timesync_provider.sh shebang
-roles/timesync/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.12.txt b/.sanity-ansible-ignore-2.12.txt
index 2d918b34..e6d5e4d6 100644
--- a/.sanity-ansible-ignore-2.12.txt
+++ b/.sanity-ansible-ignore-2.12.txt
@@ -1,2 +1 @@
 plugins/modules/timesync_provider.sh shebang
-roles/timesync/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.13.txt b/.sanity-ansible-ignore-2.13.txt
index 2d918b34..e6d5e4d6 100644
--- a/.sanity-ansible-ignore-2.13.txt
+++ b/.sanity-ansible-ignore-2.13.txt
@@ -1,2 +1 @@
 plugins/modules/timesync_provider.sh shebang
-roles/timesync/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.14.txt b/.sanity-ansible-ignore-2.14.txt
index 594e2630..791fda1c 100644
--- a/.sanity-ansible-ignore-2.14.txt
+++ b/.sanity-ansible-ignore-2.14.txt
@@ -1,4 +1,3 @@
 plugins/modules/timesync_provider.sh shebang
 plugins/modules/timesync_provider.sh validate-modules:invalid-extension
 plugins/modules/timesync_provider.sh validate-modules:python-syntax-error
-roles/timesync/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.15.txt b/.sanity-ansible-ignore-2.15.txt
index 594e2630..791fda1c 100644
--- a/.sanity-ansible-ignore-2.15.txt
+++ b/.sanity-ansible-ignore-2.15.txt
@@ -1,4 +1,3 @@
 plugins/modules/timesync_provider.sh shebang
 plugins/modules/timesync_provider.sh validate-modules:invalid-extension
 plugins/modules/timesync_provider.sh validate-modules:python-syntax-error
-roles/timesync/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.9.txt b/.sanity-ansible-ignore-2.9.txt
index 2d918b34..e6d5e4d6 100644
--- a/.sanity-ansible-ignore-2.9.txt
+++ b/.sanity-ansible-ignore-2.9.txt
@@ -1,2 +1 @@
 plugins/modules/timesync_provider.sh shebang
-roles/timesync/.ostree/get_ostree_data.sh shebang!skip