-current updates

3 files changed, 32 insertions, 10 deletions

diff --git a/mkslackinfo b/mkslackinfo
index 41a2487..4c0effc 100755
--- a/mkslackinfo
+++ b/mkslackinfo
@@ -61,6 +61,24 @@ make
 make test
 make install DESTDIR=$PKG
 EOF
+		'meson' => <<'EOF',
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+EOF
 	);
 
 	my $cmd = $buildcmds{autoconf};
@@ -87,6 +105,9 @@ EOF
 		} elsif(/\bMakefile\.PL$/) {
 			$cmd = $buildcmds{perl};
 			last;
+		} elsif(/\bmeson\.build$/) {
+			$cmd = $buildcmds{meson};
+			last;
 		}
 	}
 	close $f;
diff --git a/sbolint b/sbolint
index 0c70e61..abce9c3 100755
--- a/sbolint
+++ b/sbolint
@@ -148,7 +148,7 @@ DOS \r\n), and the last line of each must have a \n.
 =item -
 
 The SlackBuild script must exist, with mode 0755 (or 0644, if in a git repo),
-and be a I<#!/bin/sh> script.
+and be a I<#!/bin/bash> script.
 
 =item -
 
@@ -991,7 +991,7 @@ sub curl_head_request {
 # NOT going to police the script too much. Would end up rewriting most of
 # the shell, in perl. Plus, it'd become a straitjacket. Here's what I'll
 # implement:
-# - #!/bin/sh on line 1
+# - #!/bin/bash on line 1
 # - PRGNAM must match $buildname
 # - VERSION must match the .info VERSION
 # - BUILD line must be present
@@ -1012,9 +1012,9 @@ sub check_script {
 	return unless scalar @lines;
 
 	if($lines[0] !~ /^#!/) {
-		log_error("$file:1: missing or invalid shebang line (should be '#!/bin/sh')");
-	} elsif($lines[0] !~ m,#!/bin/sh(?: (?:-e|-eu|-ue|-e -u|-u -e))?$,) {
-		log_warning("$file:1: shebang line should be #!/bin/sh (possibly with -e/-u arg(s)), not '$lines[0]'");
+		log_error("$file:1: missing or invalid shebang line (should be '#!/bin/bash')");
+	} elsif($lines[0] !~ m,#!/bin/bash(?: (?:-e|-eu|-ue|-e -u|-u -e))?$,) {
+		log_warning("$file:1: shebang line should be #!/bin/bash (possibly with -e/-u arg(s)), not '$lines[0]'");
 	}
 
 	my $lineno = 0;
diff --git a/sbrun b/sbrun
index 6d3b92e..6b8c122 100755
--- a/sbrun
+++ b/sbrun
@@ -459,11 +459,12 @@ if [ "$TRACK" = "yes" ]; then
 	# in its path: trackfs will log the real path, with the links resolved.
 	TRACKFS=\
 "trackfs -l $LOG \
-	-I$( readlink -f "$TMP" )\\* \
-	-I$( readlink -f "$OUTPUT")\\* \
-	-I/tmp\\* \
-	-I/var/tmp\* \
-	-I/root/.ccache\\* \
+	-I$( readlink -f "$TMP" )/\\* \
+	-I$( readlink -f "$OUTPUT")/\\* \
+	-I/tmp/\\* \
+	-I/proc/\\* \
+	-I/var/tmp/\\* \
+	-I/root/.ccache/\\* \
 	--"
 
 fi