BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge pull request #566 from nwisemanII/SSHIdentBootstrap

Browse Source 
Accept ssh git addresses in bootstrap
This commit is contained in:
Christer Edwards
2023-01-16 11:46:16 -07:00
committed by GitHub
parent 0629233f25 5adc75abed
commit 9588d52686
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr/local/share/bastille/bootstrap.sh
+8 -1
View File
@@ -425,7 +425,7 @@ bootstrap_template() {
## define basic variables ## define basic variables
_url=${BASTILLE_TEMPLATE_URL} _url=${BASTILLE_TEMPLATE_URL}
_user=${BASTILLE_TEMPLATE_USER} _user=${BASTILLE_TEMPLATE_USER}
_repo=${BASTILLE_TEMPLATE_REPO} _repo=${BASTILLE_TEMPLATE_REPO%.*} # Remove the trailing ".git"
_template=${bastille_templatesdir}/${_user}/${_repo} _template=${bastille_templatesdir}/${_user}/${_repo}
## support for non-git ## support for non-git
@@ -543,6 +543,13 @@ http?://*/*/*)
BASTILLE_TEMPLATE_REPO=$(echo "${1}" | awk -F / '{ print $5 }') BASTILLE_TEMPLATE_REPO=$(echo "${1}" | awk -F / '{ print $5 }')
bootstrap_template bootstrap_template
;; ;;
git@*:*/*)
BASTILLE_TEMPLATE_URL=${1}
git_repository=$(echo "${1}" | awk -F : '{ print $2 }')
BASTILLE_TEMPLATE_USER=$(echo "${git_repository}" | awk -F / '{ print $1 }')
BASTILLE_TEMPLATE_REPO=$(echo "${git_repository}" | awk -F / '{ print $2 }')
bootstrap_template
;;
#adding Ubuntu Bionic as valid "RELEASE" for POC @hackacad #adding Ubuntu Bionic as valid "RELEASE" for POC @hackacad
ubuntu_bionic|bionic|ubuntu-bionic) ubuntu_bionic|bionic|ubuntu-bionic)
PLATFORM_OS="Ubuntu/Linux" PLATFORM_OS="Ubuntu/Linux"