Skip to content

Commit 28e9c51

Browse files
committed
Fix toc splitting for move-folder paths
Fixes #118
1 parent 2a5a257 commit 28e9c51

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

release.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,9 @@ if [ -f "$pkgmeta_file" ]; then
961961
;;
962962
move-folders)
963963
# Save project root directories
964+
_mf_path="${yaml_key#*/}" # strip the package name
964965
if [[ $yaml_value != *"/"* ]]; then
965-
toc_root_paths["$topdir/$yaml_value"]="$yaml_value"
966+
toc_root_paths["$topdir/$_mf_path"]="$yaml_value"
966967
fi
967968
;;
968969
esac
@@ -1041,6 +1042,7 @@ do_toc() {
10411042
20*) toc_game_type="bcc" ;;
10421043
*) toc_game_type="retail"
10431044
esac
1045+
si_game_type_interface=()
10441046
si_game_type_interface_all=()
10451047
[[ -n "$toc_game_type" ]] && si_game_type_interface_all["$toc_game_type"]="$toc_version"
10461048

@@ -1655,7 +1657,8 @@ copy_directory_tree() {
16551657
*.toc)
16561658
# We only care about processing project TOC files
16571659
if [[ -n ${toc_root_interface["$_cdt_srcdir/$file"]} ]]; then
1658-
do_toc "$_cdt_srcdir/$file" "${toc_root_paths["$_cdt_srcdir"]}"
1660+
_cdt_toc_dir="$_cdt_srcdir/${file%/*}"
1661+
do_toc "$_cdt_srcdir/$file" "${toc_root_paths["$_cdt_toc_dir"]}"
16591662
# Process the fallback TOC file according to it's base interface version
16601663
if [[ -z $_cdt_gametype && -n $_cdt_split ]]; then
16611664
case ${toc_root_interface["$_cdt_srcdir/$file"]} in

0 commit comments

Comments
 (0)