From 585fd76ae2580c586d84cce81204c4ee7cce28c5 Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Tue, 18 May 2021 21:14:03 +0200 Subject: [PATCH 1/2] alternative git template servers --- usr/local/share/bastille/bootstrap.sh | 2 +- usr/local/share/bastille/template.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh index 82d03923..7dcf6a29 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -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 }') diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh index 085704b2..07cfae12 100644 --- a/usr/local/share/bastille/template.sh +++ b/usr/local/share/bastille/template.sh @@ -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}..." From b2a4dcdd49833fc3349e8c6a3355f5806b816abe Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Tue, 25 May 2021 12:29:06 +0200 Subject: [PATCH 2/2] add verify add verify.sh as well as in PR #383 --- usr/local/share/bastille/verify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/share/bastille/verify.sh b/usr/local/share/bastille/verify.sh index da88ee5e..1246cc00 100644 --- a/usr/local/share/bastille/verify.sh +++ b/usr/local/share/bastille/verify.sh @@ -77,7 +77,7 @@ verify_template() { info "[${_hook}]:[${_include}]:" case ${_include} in - http?://github.com/*/*|http?://gitlab.com/*/*) + http?://*/*/*) bastille bootstrap "${_include}" ;; */*)