Skip to content

Commit

Permalink
refactor: get_ostree_data.sh use env shebang - remove from .sanity*
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
richm committed Dec 7, 2023
1 parent d4724c3 commit e5f2f5e
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .ostree/get_ostree_data.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -euo pipefail

Expand Down Expand Up @@ -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")")"
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ plugins/modules/certificate_request.py import-3.7!skip
plugins/modules/certificate_request.py import-3.8!skip
plugins/modules/certificate_request.py validate-modules:missing-gplv3-license
plugins/modules/certificate_request.py validate-modules:import-error
roles/certificate/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ plugins/modules/certificate_request.py import-3.8!skip
plugins/modules/certificate_request.py import-3.9!skip
plugins/modules/certificate_request.py validate-modules:missing-gplv3-license
plugins/modules/certificate_request.py validate-modules:import-error
roles/certificate/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ plugins/modules/certificate_request.py import-3.9!skip
plugins/modules/certificate_request.py import-3.10!skip
plugins/modules/certificate_request.py validate-modules:missing-gplv3-license
plugins/modules/certificate_request.py validate-modules:import-error
roles/certificate/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ plugins/modules/certificate_request.py import-3.9!skip
plugins/modules/certificate_request.py import-3.10!skip
plugins/modules/certificate_request.py validate-modules:missing-gplv3-license
plugins/modules/certificate_request.py validate-modules:import-error
roles/certificate/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ plugins/modules/certificate_request.py import-3.10!skip
plugins/modules/certificate_request.py import-3.11!skip
plugins/modules/certificate_request.py validate-modules:missing-gplv3-license
plugins/modules/certificate_request.py validate-modules:import-error
roles/certificate/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.15.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ plugins/modules/certificate_request.py import-3.10!skip
plugins/modules/certificate_request.py import-3.11!skip
plugins/modules/certificate_request.py validate-modules:missing-gplv3-license
plugins/modules/certificate_request.py validate-modules:import-error
roles/certificate/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ plugins/modules/certificate_request.py import-3.7!skip
plugins/modules/certificate_request.py import-3.8!skip
plugins/modules/certificate_request.py validate-modules:missing-gplv3-license
plugins/modules/certificate_request.py validate-modules:import-error
roles/certificate/.ostree/get_ostree_data.sh shebang!skip

0 comments on commit e5f2f5e

Please sign in to comment.