Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Use distinct TOC files" #106

Merged
merged 1 commit into from
Aug 26, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -963,27 +963,6 @@ if [[ ! -f "$topdir/$toc_path" && -f "$topdir/$package/$toc_path" ]]; then
toc_path="$package/$toc_path"
fi

# Use distinct TOC file if it exists
if [[ "$game_type" == "classic" ]]; then
if [[ -f "$topdir/$package-Classic.toc" ]]; then
toc_path="$package-Classic.toc"
elif [[ ! -f "$topdir/$package-Classic.toc" && -f "$topdir/$package/$package-Classic.toc" ]]; then
toc_path="$package/$package-Classic.toc"
fi
elif [[ "$game_type" == "bcc" ]]; then
if [[ -f "$topdir/$package-BCC.toc" ]]; then
toc_path="$package-BCC.toc"
elif [[ ! -f "$topdir/$package-BCC.toc" && -f "$topdir/$package/$package-BCC.toc" ]]; then
toc_path="$package/$package-BCC.toc"
fi
elif [[ "$game_type" == "retail" ]]; then
if [[ -f "$topdir/$package-Mainline.toc" ]]; then
toc_path="$package-Mainline.toc"
elif [[ ! -f "$topdir/$package-Mainline.toc" && -f "$topdir/$package/$package-Mainline.toc" ]]; then
toc_path="$package/$package-Mainline.toc"
fi
fi

if [[ ! -f "$topdir/$toc_path" ]]; then
echo "Could not find an addon TOC file. In another directory? Make sure it matches the 'package-as' in .pkgmeta" >&2
exit 1
Expand Down