diff options
| author | наб <[email protected]> | 2021-05-22 01:45:40 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-06-09 13:05:34 -0700 |
| commit | 91bb2e91bd8323fd616c6a5c503fe430bc61ef73 (patch) | |
| tree | 9a37dc3d3aa0926ebf6935bea1a0ec42fcc0f4aa /scripts | |
| parent | 132240507d0ab2999e764537b181e89ecc3c2b0e (diff) | |
Turn checkbashisms into a make target
make_gitrev.sh actually breaks checkbashisms' parser,
which /insists/ that the end-of-line " is actually a string start
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #12101
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make_gitrev.sh | 4 | ||||
| -rwxr-xr-x | scripts/paxcheck.sh | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/make_gitrev.sh b/scripts/make_gitrev.sh index f5c743b13..da2145533 100755 --- a/scripts/make_gitrev.sh +++ b/scripts/make_gitrev.sh @@ -56,9 +56,9 @@ then # already exists (in the source) if [ -f "${top_srcdir}/${GITREV}" ] then - ZFS_GITREV="$(sed -n \ + ZFS_GITREV=$(sed -n \ '1s/^#define[[:blank:]]ZFS_META_GITREV "\([^"]*\)"$/\1/p' \ - "${top_srcdir}/${GITREV}")" + "${top_srcdir}/${GITREV}") fi elif [ ${dist} = yes ] then diff --git a/scripts/paxcheck.sh b/scripts/paxcheck.sh index 87e817500..27acc9536 100755 --- a/scripts/paxcheck.sh +++ b/scripts/paxcheck.sh @@ -1,7 +1,6 @@ #!/bin/sh -# shellcheck disable=SC2039 -if ! type scanelf > /dev/null 2>&1; then +if ! command -v scanelf > /dev/null; then echo "scanelf (from pax-utils) is required for these checks." >&2 exit 3 fi |