Skip to content

Commit b2b7bea

Browse files
committed
Templates: Fix zip having full pwd instead of templates/ parent
Was a regression from #2.
1 parent 340eba3 commit b2b7bea

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

build-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export reldir="${basedir}/releases/${godot_version}"
5454
export reldir_mono="${reldir}/mono"
5555
export tmpdir="${basedir}/tmp"
5656
export templatesdir="${tmpdir}/templates"
57-
export templatesdir_mono="${templatesdir}-mono"
57+
export templatesdir_mono="${tmpdir}/mono/templates"
5858

5959
export godot_basename="Godot_v${godot_version}"
6060

build-templates.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export reldir="${basedir}/releases/${godot_version}"
4444
export reldir_mono="${reldir}/mono"
4545
export tmpdir="${basedir}/tmp"
4646
export templatesdir="${tmpdir}/templates"
47-
export templatesdir_mono="${templatesdir}-mono"
47+
export templatesdir_mono="${tmpdir}/mono/templates"
4848

4949
export godot_basename="Godot_v${godot_version}"
5050

@@ -54,7 +54,9 @@ if [ "${build_classical}" == "1" ]; then
5454
echo "${templates_version}" > ${templatesdir}/version.txt
5555

5656
mkdir -p ${reldir}
57-
zip -q -9 -r -D "${reldir}/${godot_basename}_export_templates.tpz" ${templatesdir}
57+
pushd ${templatesdir}/..
58+
zip -q -9 -r -D "${reldir}/${godot_basename}_export_templates.tpz" templates/*
59+
popd
5860
fi
5961

6062
# Mono
@@ -63,7 +65,9 @@ if [ "${build_mono}" == "1" ]; then
6365
echo "${templates_version}.mono" > ${templatesdir_mono}/version.txt
6466

6567
mkdir -p ${reldir_mono}
66-
zip -q -9 -r -D "${reldir_mono}/${godot_basename}_mono_export_templates.tpz" ${templatesdir_mono}
68+
pushd ${templatesdir_mono}/..
69+
zip -q -9 -r -D "${reldir_mono}/${godot_basename}_mono_export_templates.tpz" templates/*
70+
popd
6771
fi
6872

6973
echo "Templates archives generated successfully"

0 commit comments

Comments
 (0)