0.3.20181114 fix all the things

This commit is contained in:
Christer Edwards
2018-11-13 21:40:11 -07:00
parent 2533f44187
commit 8b7fb790e4
12 changed files with 36 additions and 25 deletions

View File

@@ -34,7 +34,7 @@ SAVED_TERM=$TERM
. /usr/local/etc/bastille/bastille.conf
## version
BASTILLE_VERSION="0.3.20181112"
BASTILLE_VERSION="0.3.20181114"
usage() {
@@ -93,20 +93,10 @@ case "${CMD}" in
cmd|cp|create|destroy|list|pkg|restart|start|stop|sysrc|template|verify)
;;
update|upgrade)
CMD_ENV="${CMD_ENV} PAGER=cat"
;;
console|bootstrap|htop|top)
;;
bootstrap|update|upgrade)
while read envvar envvalue; do
case "${envvar}" in
FETCH_BIND_ADDRESS|FTP_*|ftp_*|HTTP_*|http_*|SSL_|NO_PROXY|no_proxy|MAKEOBJDIRPREFIX)
CMD_ENV="${CMD_ENV} ${envvar}=${envvalue}"
;;
esac
done <<-EOF
$(env | sed -Ee 's,^([^=]*)=(.*),\1 \2,')
EOF
;;
*)
usage
@@ -121,4 +111,4 @@ umask ${UMASK}
: ${SH:=sh}
exec env -i ${CMD_ENV} ${SH} "${SCRIPTPATH}" "$@"
exec ${SH} "${SCRIPTPATH}" "$@"