Skip to content

Commit

Permalink
Skip external toc files when checking keywords
Browse files Browse the repository at this point in the history
Including unprocessed tocs might look weird, but they're harmless.

Resolves #158
  • Loading branch information
nebularg committed Sep 14, 2023
1 parent 4a3d0e9 commit 0ee9a5d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,7 @@ copy_directory_tree() {
echo " Copying: $file${_cdt_external_slug:+ (embedded: "$_cdt_external_slug")}"

# Make sure we're not causing any surprises
if [[ -z $_cdt_file_gametype && ( $file == *".lua" || $file == *".xml" || $file == *".toc" ) ]] && grep -q '@\(non-\)\?version-\(retail\|classic\|bcc\|wrath\)@' "$_cdt_source_file"; then
if [[ -z $_cdt_file_gametype && ( $file == *".lua" || $file == *".xml" || ( -z $_cdt_external && $file == *".toc" ) ) ]] && grep -q '@\(non-\)\?version-\(retail\|classic\|bcc\|wrath\)@' "$_cdt_source_file"; then
echo " Error! Build type version keywords are not allowed in a multi-version build." >&2
echo " These should be replaced with lua conditional statements:" >&2
grep -n '@\(non-\)\?version-\(retail\|classic\|bcc\|wrath\)@' "$_cdt_source_file" | sed 's/^/ /' >&2
Expand Down

0 comments on commit 0ee9a5d

Please sign in to comment.