Merge branch 'tools' into 'pregmod-master'

CheckJS.sh and a fix to makeTwineJS

See merge request !6844

devTools/checkJS.sh

+#!/bin/sh
+
+tmpJoinedFile=`mktemp --suffix=.js`
+
+files=$(find js src -name '*.js' -print)
+files=$(echo "$files" | sort)
+for f in $files; do
+	printf "\n/* ${f} */\n" >> "$tmpJoinedFile"
+	cat "$f" >> "$tmpJoinedFile"
+done
+
+node -c "$tmpJoinedFile"
+
+test $? -eq 0 && rm "$tmpJoinedFile"

devTools/makeTwineJSPassage.sh

@@ -6,7 +6,7 @@
 # $1: root repo dir
 # $2: output file name
 collectJSForTwine() {
-	local files=$(find js src/js -path ./art/assistantArt.js -prune -o -name '*.js' -print)
+	local files=$(find js src -path ./src/art/assistantArt.js -prune -o -name '*.js' -print)
 	files=$(echo "$files" | sort)
 	echo "" > "$2"
 	for f in $files; do