Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: get_ostree_data.sh use env shebang - remove from .sanity* #406

Merged
merged 1 commit into from
Dec 7, 2023
Merged

refactor: get_ostree_data.sh use env shebang - remove from .sanity* #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .ostree/get_ostree_data.sh
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ tests/storage/scripts/generate_tests.py future-import-boilerplate!skip
tests/storage/scripts/generate_tests.py shebang!skip
tests/storage/scripts/post-commit shebang!skip
tests/storage/scripts/pre-commit shebang!skip
roles/storage/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.11.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ tests/storage/scripts/generate_tests.py future-import-boilerplate!skip
tests/storage/scripts/generate_tests.py shebang!skip
tests/storage/scripts/post-commit shebang!skip
tests/storage/scripts/pre-commit shebang!skip
roles/storage/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.12.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
tests/storage/scripts/generate_tests.py shebang!skip
tests/storage/scripts/post-commit shebang!skip
tests/storage/scripts/pre-commit shebang!skip
roles/storage/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.13.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
tests/storage/scripts/generate_tests.py shebang!skip
tests/storage/scripts/post-commit shebang!skip
tests/storage/scripts/pre-commit shebang!skip
roles/storage/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.14.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
tests/storage/scripts/generate_tests.py shebang!skip
tests/storage/scripts/post-commit shebang!skip
tests/storage/scripts/pre-commit shebang!skip
roles/storage/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.15.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
tests/storage/scripts/generate_tests.py shebang!skip
tests/storage/scripts/post-commit shebang!skip
tests/storage/scripts/pre-commit shebang!skip
roles/storage/.ostree/get_ostree_data.sh shebang!skip
1 change: 0 additions & 1 deletion .sanity-ansible-ignore-2.9.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ tests/storage/scripts/generate_tests.py future-import-boilerplate!skip
tests/storage/scripts/generate_tests.py shebang!skip
tests/storage/scripts/post-commit shebang!skip
tests/storage/scripts/pre-commit shebang!skip
roles/storage/.ostree/get_ostree_data.sh shebang!skip
Loading