From 7e22a6ba14adfb24620de1911364c9ff76f6cf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Mon, 1 Jun 2020 13:40:06 +0200 Subject: [PATCH] src/check-commit: make the script more readable --- src/check-commit | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/check-commit b/src/check-commit index db73d4a..a70a066 100755 --- a/src/check-commit +++ b/src/check-commit @@ -9,7 +9,7 @@ # Check if we are in a git repo if ! git status >/dev/null; then - echo Stop + echo "Stop" exit 1 fi @@ -18,6 +18,11 @@ fi [ -z "${ARCH}" ] && export ARCH=x86_64 [ -z "${ACCEPT_KEYWORDS}" ] && export ACCEPT_KEYWORDS='**' +# create "eclass" +# apparently pkgcheck needs it +# "pkgcheck scan: error: failed running git: fatal: eclass: no such path in the working tree." +[ -d eclass ] || mkdir eclass + # First test for a whole repo # This will likely exit firh error, because repoman @@ -28,12 +33,6 @@ repoman -Idix pkgcheck scan -# create "eclass" -# apparently pkgcheck needs it -# "pkgcheck scan: error: failed running git: fatal: eclass: no such path in the working tree." -[ -d eclass ] || mkdir eclass - - echo ">>> Starting latest commit test" test_success=true @@ -48,12 +47,16 @@ pkgcheck scan --commits || test_success=false for file in $(git diff --name-only HEAD HEAD~1) do commit_dir="$(dirname "${file}")" + + # skip these directories [[ "${commit_dir}" = *eclass ]] && continue [[ "${commit_dir}" = *files ]] && continue [[ "${commit_dir}" = *licenses* ]] && continue [[ "${commit_dir}" = *metadata* ]] && continue [[ "${commit_dir}" = *profiles ]] && continue - if cd "${commit_dir}"; then + + if cd "${commit_dir}" + then echo echo "Directory $(pwd):" repoman -Idix || test_success=false