File tree 1 file changed +5
-2
lines changed
1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -961,8 +961,9 @@ if [ -f "$pkgmeta_file" ]; then
961
961
;;
962
962
move-folders)
963
963
# Save project root directories
964
+ _mf_path=" ${yaml_key#*/ } " # strip the package name
964
965
if [[ $yaml_value != * " /" * ]]; then
965
- toc_root_paths[" $topdir /$yaml_value " ]=" $yaml_value "
966
+ toc_root_paths[" $topdir /$_mf_path " ]=" $yaml_value "
966
967
fi
967
968
;;
968
969
esac
@@ -1041,6 +1042,7 @@ do_toc() {
1041
1042
20* ) toc_game_type=" bcc" ;;
1042
1043
* ) toc_game_type=" retail"
1043
1044
esac
1045
+ si_game_type_interface=()
1044
1046
si_game_type_interface_all=()
1045
1047
[[ -n " $toc_game_type " ]] && si_game_type_interface_all[" $toc_game_type " ]=" $toc_version "
1046
1048
@@ -1655,7 +1657,8 @@ copy_directory_tree() {
1655
1657
* .toc)
1656
1658
# We only care about processing project TOC files
1657
1659
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"]} "
1659
1662
# Process the fallback TOC file according to it's base interface version
1660
1663
if [[ -z $_cdt_gametype && -n $_cdt_split ]]; then
1661
1664
case ${toc_root_interface["$_cdt_srcdir/$file"]} in
You can’t perform that action at this time.
0 commit comments