Merge pull request #381 from hackacad/open_templates

allow alternative template servers
This commit is contained in:
Christer Edwards
2021-05-25 07:12:09 -06:00
committed by GitHub
3 changed files with 3 additions and 3 deletions

View File

@@ -426,7 +426,7 @@ current-build-latest|current-BUILD-LATEST|CURRENT-BUILD-LATEST)
PLATFORM_OS="HardenedBSD"
validate_release_url
;;
http?://github.com/*/*|http?://gitlab.com/*/*)
http?://*/*/*)
BASTILLE_TEMPLATE_URL=${1}
BASTILLE_TEMPLATE_USER=$(echo "${1}" | awk -F / '{ print $4 }')
BASTILLE_TEMPLATE_REPO=$(echo "${1}" | awk -F / '{ print $5 }')

View File

@@ -173,7 +173,7 @@ if [ "${TARGET}" = '--convert' ]; then
fi
case ${TEMPLATE} in
http?://github.com/*/*|http?://gitlab.com/*/*)
http?://*/*/*)
TEMPLATE_DIR=$(echo "${TEMPLATE}" | awk -F / '{ print $4 "/" $5 }')
if [ ! -d "${bastille_templatesdir}/${TEMPLATE_DIR}" ]; then
info "Bootstrapping ${TEMPLATE}..."

View File

@@ -77,7 +77,7 @@ verify_template() {
info "[${_hook}]:[${_include}]:"
case ${_include} in
http?://github.com/*/*|http?://gitlab.com/*/*)
http?://*/*/*)
bastille bootstrap "${_include}"
;;
*/*)