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

Merge pull request #27 from cedwards/master

Browse Source 
bootstrap fix
This commit is contained in:
Christer Edwards
2019-01-02 20:10:46 -07:00
committed by GitHub
parent d35b2cc119 655f8d0fe9
commit 29e98b554f
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usr/local/bin/bastille
View File

@@ -32,7 +32,7 @@
. /usr/local/etc/bastille/bastille.conf . /usr/local/etc/bastille/bastille.conf
## version ## version
BASTILLE_VERSION="0.3.20181202" BASTILLE_VERSION="0.3.20190102"
usage() { usage() {
cat << EOF cat << EOF

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

@@ -165,27 +165,23 @@ bootstrap_template() {
# Filter sane release names # Filter sane release names
case "${1}" in case "${1}" in
10.1-RELEASE|10.2-RELEASE|10.3-RELEASE|10.4-RELEASE) 10.1-RELEASE|10.2-RELEASE|10.3-RELEASE|10.4-RELEASE)
RELEASE="${1}"
bootstrap_release bootstrap_release
echo -e "${COLOR_RED}WARNING: FreeBSD 10.1-RELEASE HAS PASSED ITS END-OF-LIFE DATE.${COLOR_RESET}" echo -e "${COLOR_RED}WARNING: FreeBSD 10.1-RELEASE HAS PASSED ITS END-OF-LIFE DATE.${COLOR_RESET}"
;; ;;
11.0-RELEASE|11.1-RELEASE) 11.0-RELEASE|11.1-RELEASE)
RELEASE="${1}"
bootstrap_release bootstrap_release
echo -e "${COLOR_RED}WARNING: FreeBSD 11.0-RELEASE HAS PASSED ITS END-OF-LIFE DATE.${COLOR_RESET}" echo -e "${COLOR_RED}WARNING: FreeBSD 11.0-RELEASE HAS PASSED ITS END-OF-LIFE DATE.${COLOR_RESET}"
;; ;;
11.2-RELEASE) 11.2-RELEASE)
RELEASE="${1}"
bootstrap_release bootstrap_release
;; ;;
12.0-RELEASE) 12.0-RELEASE)
RELEASE="${1}"
bootstrap_release bootstrap_release
;; ;;
12.0-BETA1|12.0-BETA2|12.0-BETA3|12.0-BETA4)
bootstrap_release
echo -e "${COLOR_RED}BETA releases are completely untested.${COLOR_RESET}"
;;
12.0-RC1|12.0-RC2|12.0-RC3)
bootstrap_release
echo -e "${COLOR_RED}RC releases are completely untested.${COLOR_RESET}"
;;
http?://github.com/*/*) http?://github.com/*/*)
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 }')