Merge branch 'fix-twine-js' into 'pregmod-master'

Fix twine js

See merge request !3404

devTools/makeTwineJSPassage.sh

@@ -6,8 +6,13 @@
 # $1: root repo dir
 # $2: output file name
 collectJSForTwine() {
+	local files=$(find . -path ./art/assistantArt.js -prune -o -name '*.js' -print)
+	files=$(echo "$files" | sort)
 	echo "" > "$2"
-	find . -path ./art/assistantArt.js -prune -o -name '*.js' -exec echo -e "\n/* {} */\n" \; -a -exec sed -nf "$1"/devTools/stripComments.sed {} \; >> "$2"
+	for f in $files; do
+		echo -e "\n/* ${f} */\n" >> "$2"
+		sed -nf "$1"/devTools/stripComments.sed "$f" >> "$2"
+	done
 }
 
 ROOT_REPO_DIR="$(git rev-parse --show-toplevel)"