diff options
| author | B. Watson <urchlay@slackware.uk> | 2023-06-15 05:23:19 -0400 |
|---|---|---|
| committer | B. Watson <urchlay@slackware.uk> | 2023-06-15 05:23:19 -0400 |
| commit | f7780841554001639e7df097ba0ee2ae45510197 (patch) | |
| tree | 6dc48670784df9931f8c1429b6a0a9eab52522b3 /sbopkglint.d | |
| parent | 9703fdec3ecff8ac6c50524db5c1039326667fe8 (diff) | |
| download | sbo-maintainer-tools-f7780841554001639e7df097ba0ee2ae45510197.tar.gz | |
sbopkglint: more colors, handle spaces in filenames (WIP).
Diffstat (limited to 'sbopkglint.d')
| -rw-r--r-- | sbopkglint.d/05-basic-sanity.t.sh | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sbopkglint.d/05-basic-sanity.t.sh b/sbopkglint.d/05-basic-sanity.t.sh index 96bce44..22dc309 100644 --- a/sbopkglint.d/05-basic-sanity.t.sh +++ b/sbopkglint.d/05-basic-sanity.t.sh @@ -134,21 +134,21 @@ done for i in $fileonlydirs; do [ -d "$i" ] || continue dir_ok "$i" || warn_badperms "$i" - badstuff="$( find -L "$i" -mindepth 1 -maxdepth 1 \! \( -type l -o -type f \) )" - [ -n "$badstuff" ] && warn "$i should only contain files, not:" && ls -ld $badstuff + find_warnfiles "$i should only contain files, not:" \ + -L "$i" -mindepth 1 -maxdepth 1 \! \( -type l -o -type f \) done for i in $bindirs; do [ -d "$i" ] || continue - badstuff="$( find -L "$i" -mindepth 1 -maxdepth 1 -type f \! -perm /0111 )" - [ -n "$badstuff" ] && warn "$i should only contain executable files, not:" && ls -ld $badstuff + find_warnfiles "$i should only contain executable files, not:" \ + -L "$i" -mindepth 1 -maxdepth 1 -type f \! -perm /0111 done for i in $nofiledirs; do [ -d "$i" ] || continue dir_ok "$i" || warn_badperms "$i" - badstuff="$( find -L "$i" -mindepth 1 -maxdepth 1 \! -type d )" - [ -n "$badstuff" ] && warn "$i should only contain directories, not:" && ls -ld $badstuff + find_warnfiles "$i should only contain directories, not:" \ + -L "$i" -mindepth 1 -maxdepth 1 \! -type d done if [ -z "$SLACKBUILD_MISSING_OK" ]; then @@ -159,11 +159,8 @@ fi for i in $noexecdirs; do [ -d "$i" ] || continue - found="$( find "$i" -type f -a -perm /0111 )" - if [ -n "$found" ]; then - warn "$i should not contain files with executable permission:" - ls -l $found - fi + find_warnfiles "$i should not contain files with executable permission:" \ + "$i" -type f -a -perm /0111 done for i in $badfiles; do @@ -185,5 +182,5 @@ brokenlinks="$( find -L . -type l \! -lname '/*' )" # 20230320 bkw: empty directories. this isn't an error, just a note, and # we ignore any empty dirs under /var because lots of packages need these. -emptydirs="$( find . -type d -a -empty | grep -v '^\./var\>' )" -[ -n "$emptydirs" ] && note "package contains empty dirs, are these necessary?" && ls -ld $emptydirs +find_warnfiles --note "package contains empty dirs, are these necessary?" \ + . -type d -a -empty -a \! -path "./var/*" |