diff options
| -rwxr-xr-x | mkslackinfo | 9 | ||||
| -rwxr-xr-x | sbolint | 11 | ||||
| -rwxr-xr-x | sbrun | 1 | ||||
| -rwxr-xr-x | upkg | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/mkslackinfo b/mkslackinfo index 4c0effc..75e1f3f 100755 --- a/mkslackinfo +++ b/mkslackinfo @@ -296,7 +296,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -344,10 +343,10 @@ find $PKG -name perllocal.pod \ -o -name "*.bs" \ | xargs rm -f -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a <documentation> \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp -a <documentation> $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -638,9 +638,11 @@ sub check_and_read { return @lines; } +# 20220205 bkw: don't complain about long lines if they're URLs, +# not much we can do about them. sub check_readme { my @lines = check_and_read("README", 0644); - if(grep { length > 72 } @lines) { + if(grep { !/^\s*(ftp|https?):\/\// && length > 72 } @lines) { log_warning("README has lines >72 characters"); } # TODO: check encoding (must be ASCII or UTF-8) @@ -1076,7 +1078,10 @@ sub check_script { if($tag !~ /\$\{TAG:-(?:_SBo|("|')_SBo(\1))\}/) { log_error("$file:$lineno: TAG=\${TAG:-_SBo} is required"); } - } elsif(/^[^#]*\$\S*CWD\S*\/doinst.sh/) { + } elsif(/^[^#]*[^>]>[^>]*doinst\.sh/) { + # 20220205 bkw: some scripts don't have a doinst.sh in the + # script dir, but they create one with >> (the jack rt audio stuff + # does this). $need_doinst = $lineno; } elsif(/^[^#]*slack-desc/) { $slackdesc = $lineno; @@ -1292,7 +1297,7 @@ sub im_check_img { $ext =~ s,.*\.,,; $ext = lc $ext; - chomp($mime = `file --brief --mime "$img"`); + chomp($mime = `file -L --brief --mime "$img"`); if($mime !~ /$ext2mime{$ext}/) { log_error("$img has wrong extension $ext (MIME type is $mime)"); return; @@ -465,6 +465,7 @@ if [ "$TRACK" = "yes" ]; then -I/proc/\\* \ -I/var/tmp/\\* \ -I/root/.ccache/\\* \ + -I/dev/pts/\\* \ --" fi @@ -28,7 +28,7 @@ OUTPUT=${OUTPUT:-/tmp} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac |