Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-01-06 04:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #381 from hackacad/open_templates

Browse Source 
allow alternative template servers
This commit is contained in:
Christer Edwards
2021-05-25 07:12:09 -06:00
committed by GitHub
parent 814201fa9f e48ef60cd6
commit 91aee11b54
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usr/local/share/bastille/bootstrap.sh
View File

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

2
usr/local/share/bastille/template.sh
View File

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

2
usr/local/share/bastille/verify.sh
View File

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