diff --git a/.ostree/get_ostree_data.sh b/.ostree/get_ostree_data.sh index cec08b0..65830d6 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.12.txt b/.sanity-ansible-ignore-2.12.txt deleted file mode 100644 index 0d6b045..0000000 --- a/.sanity-ansible-ignore-2.12.txt +++ /dev/null @@ -1 +0,0 @@ -roles/template/.ostree/get_ostree_data.sh shebang!skip diff --git a/.sanity-ansible-ignore-2.13.txt b/.sanity-ansible-ignore-2.13.txt deleted file mode 100644 index 0d6b045..0000000 --- a/.sanity-ansible-ignore-2.13.txt +++ /dev/null @@ -1 +0,0 @@ -roles/template/.ostree/get_ostree_data.sh shebang!skip diff --git a/.sanity-ansible-ignore-2.14.txt b/.sanity-ansible-ignore-2.14.txt deleted file mode 100644 index 0d6b045..0000000 --- a/.sanity-ansible-ignore-2.14.txt +++ /dev/null @@ -1 +0,0 @@ -roles/template/.ostree/get_ostree_data.sh shebang!skip diff --git a/.sanity-ansible-ignore-2.15.txt b/.sanity-ansible-ignore-2.15.txt deleted file mode 100644 index 0d6b045..0000000 --- a/.sanity-ansible-ignore-2.15.txt +++ /dev/null @@ -1 +0,0 @@ -roles/template/.ostree/get_ostree_data.sh shebang!skip diff --git a/.sanity-ansible-ignore-2.9.txt b/.sanity-ansible-ignore-2.9.txt deleted file mode 100644 index 0d6b045..0000000 --- a/.sanity-ansible-ignore-2.9.txt +++ /dev/null @@ -1 +0,0 @@ -roles/template/.ostree/get_ostree_data.sh shebang!skip