Skip to content

Commit

Permalink
Merge remote-tracking branch 'blueprint/dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	info.md
  • Loading branch information
Limych committed May 8, 2021
2 parents 9338d0f + 69056e7 commit 5301b5c
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 6 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

[![hacs][hacs-shield]][hacs]
[![Project Maintenance][maintenance-shield]][user_profile]
[![Support me on Patreon][patreon-shield]][patreon]

[![Community Forum][forum-shield]][forum]

Expand Down Expand Up @@ -180,3 +181,5 @@ See separate [license file](LICENSE.md) for full text.
[report_bug]: https://github.com/Limych/ha-jq300/issues/new?template=bug_report.md
[suggest_idea]: https://github.com/Limych/ha-jq300/issues/new?template=feature_request.md
[contributors]: https://github.com/Limych/ha-jq300/graphs/contributors
[patreon-shield]: https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3DLimych%26type%3Dpatrons&style=popout
[patreon]: https://www.patreon.com/join/limych
38 changes: 32 additions & 6 deletions bin/devcontainer
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,39 @@ port="127.0.0.1:9123:8123"
image="ludeeus/container:integration-debian"
volume="${ROOT}:${workdir}"

if [[ "${1}" == "--public" ]]; then
cmd="menu"
while test $# -gt 0; do
case "${1}" in
--help|-h)
log.info "devcontainer [options] [command]"
log.info ""
log.info "Options:"
log.info " -h, --help Show this help."
log.info " --public Create dev container externally accessible"\
"(Only makes sense when creating a new container)."
log.info ""
log.info "Commands:"
log.info " start Start dev container."
log.info " stop Save current state of dev container and stop it."
log.info " check Run Home Assistant config check."
log.info " set-version Install a specific version of Home Assistant."
log.info " upgrade Upgrade Home Assistant to latest dev"\
"then run user's bootstrap script again."
log.info " bootstrap Run user's bootstrap script again."
log.info " bash Run command line into dev container."
log.info " down Destroy dev container."
die
;;
--public)
log.info "Attention! The container is creating externally accessible."
port=$(echo "${port}" | sed "s/127.0.0.1/0.0.0.0/")
;;
*)
cmd="${1}"
;;
esac
shift
log.info "Attention! The container is creating externally accessible."
port=$(echo "${port}" | sed "s/127.0.0.1/0.0.0.0/")
fi

cmd="${1:-menu}"
done

docker_start() {
tmp=$(echo "${port}" | cut -d":" -f-2)
Expand Down
3 changes: 3 additions & 0 deletions bin/release
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ if output=$(git status --porcelain) && [[ -n "$output" ]]; then
log.info ${output}
exit 2
fi
if ! pytest; then
exit 3
fi

const_path=$(find custom_components/ -name const.py)
version=$(grep "^VERSION =" ${const_path} | sed -E "s/^[^\"]+\"([^\"]*).*$/\\1/")
Expand Down
3 changes: 3 additions & 0 deletions info.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

[![hacs][hacs-shield]][hacs]
[![Project Maintenance][maintenance-shield]][user_profile]
[![Support me on Patreon][patreon-shield]][patreon]

[![Community Forum][forum-shield]][forum]

Expand Down Expand Up @@ -60,3 +61,5 @@ I put a lot of work into making this repo and component available and updated to
[report_bug]: https://github.com/Limych/ha-jq300/issues/new?template=bug_report.md
[suggest_idea]: https://github.com/Limych/ha-jq300/issues/new?template=feature_request.md
[contributors]: https://github.com/Limych/ha-jq300/graphs/contributors
[patreon-shield]: https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3DLimych%26type%3Dpatrons&style=popout
[patreon]: https://www.patreon.com/join/limych

0 comments on commit 5301b5c

Please sign in to comment.