From 9633ce3c8fd610a97b673f03ed2b1f272ac9b708 Mon Sep 17 00:00:00 2001 From: tschettervictor <85497460+tschettervictor@users.noreply.github.com> Date: Wed, 23 Apr 2025 18:45:19 -0600 Subject: [PATCH] bootstrap: Bugfix when bootstrapping multiple templates --- usr/local/share/bastille/bootstrap.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh index 198d970b..b8b83b1c 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -424,10 +424,12 @@ bootstrap_template() { if [ ! -f ${_raw_template_dir}/Bastillefile ]; then # Extract template in project/template format find "${_raw_template_dir}" -type f -name Bastillefile | while read -r _file; do - _project="$(dirname "$(dirname ${_file})")" - _template="$(basename ${_project})" - _complete_template="$(basename ${_project})"/"$(basename "$(dirname ${_file})")" - cp -fR "${_project}" "${bastille_templatesdir}/${_template}" + _template_dir="$(dirname ${_file})" + _project_dir="$(dirname ${_template_dir})" + _template_name="$(basename ${_template_dir})" + _project_name="$(basename ${_project_dir})" + _complete_template="${_project_name}/${_template_name}" + cp -fR "${_project_dir}" "${bastille_templatesdir}" bastille verify "${_complete_template}" done