From c0321b433b6dc72b4457bad77586b332710d1d0d Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Wed, 9 Dec 2020 15:44:54 +0100 Subject: [PATCH] utils/build-galaxy-release.sh: Fix covscan findings warning[SC2044]: For loops over find output are fragile. Use find -exec or a while read loop. warning[SC2164]: Use 'cd ... || exit' or 'cd ... || return' in case cd fails. --- utils/build-galaxy-release.sh | 52 +++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 24 deletions(-) mode change 100644 => 100755 utils/build-galaxy-release.sh diff --git a/utils/build-galaxy-release.sh b/utils/build-galaxy-release.sh old mode 100644 new mode 100755 index 71bd8077..fcb99e99 --- a/utils/build-galaxy-release.sh +++ b/utils/build-galaxy-release.sh @@ -14,46 +14,50 @@ find . -name "*~" -exec rm {} \; sed -i -e "s/ansible.module_utils.ansible_freeipa_module/ansible_collections.${collection_prefix}.plugins.module_utils.ansible_freeipa_module/" plugins/modules/*.py -cd plugins/module_utils && { +(cd plugins/module_utils && { ln -s ../../roles/*/module_utils/*.py . - cd ../.. -} +}) -cd plugins/modules && { +(cd plugins/modules && { sed -i -e "s/ansible.module_utils.ansible_ipa_/ansible_collections.${collection_prefix}.plugins.module_utils.ansible_ipa_/" ../../roles/*/library/*.py ln -s ../../roles/*/library/*.py . - cd ../.. -} +}) [ ! -x plugins/action_plugins ] && mkdir plugins/action_plugins -cd plugins/action_plugins && { +(cd plugins/action_plugins && { ln -s ../../roles/*/action_plugins/*.py . - cd ../.. -} +}) -for x in $(find plugins/modules -name "*.py" -print); do - python utils/galaxyfy-module-EXAMPLES.py "$x" "ipa" "$collection_prefix" -done +find plugins/modules -name "*.py" -print0 | + while IFS= read -d -r '' line; do + python utils/galaxyfy-module-EXAMPLES.py "$x" \ + "ipa" "$collection_prefix" + done -for x in $(find roles/*/library -name "*.py" -print); do - python utils/galaxyfy-module-EXAMPLES.py "$x" "ipa" "$collection_prefix" -done +find roles/*/library -name "*.py" -print0 | + while IFS= read -d -r '' line; do + python utils/galaxyfy-module-EXAMPLES.py "$x" \ + "ipa" "$collection_prefix" + done for x in roles/*/tasks/*.yml; do python utils/galaxyfy-playbook.py "$x" "ipa" "$collection_prefix" done -for x in $(find playbooks -name "*.yml" -print); do - python utils/galaxyfy-playbook.py "$x" "ipa" "$collection_prefix" -done +find playbooks -name "*.yml" -print0 | + while IFS= read -d -r '' line; do + python utils/galaxyfy-playbook.py "$x" "ipa" "$collection_prefix" + done -for x in $(find . -name "README*.md" -print); do - python utils/galaxyfy-README.py "$x" "ipa" "$collection_prefix" -done +find . -name "README*.md" -print0 | + while IFS= read -d -r '' line; do + python utils/galaxyfy-README.py "$x" "ipa" "$collection_prefix" + done -for x in $(find tests -name "*.yml" -print); do - python utils/galaxyfy-playbook.py "$x" "ipa" "$collection_prefix" -done +find tests -name "*.yml" -print0 | + while IFS= read -d -r '' line; do + python utils/galaxyfy-playbook.py "$x" "ipa" "$collection_prefix" + done #git diff