diff --git a/admin/daemon.bash b/admin/daemon.bash index b0df245..c87ef9f 100644 --- a/admin/daemon.bash +++ b/admin/daemon.bash @@ -1,7 +1,6 @@ #!/usr/bin/env bash source "${BASH_SOURCE%/*}/daemon/common.bash" -build_log="/tmp/treehouse_build.log" trap 'trap - SIGTERM && kill 0' SIGTERM SIGINT EXIT diff --git a/admin/daemon/common.bash b/admin/daemon/common.bash index 3580e68..f0cf55f 100644 --- a/admin/daemon/common.bash +++ b/admin/daemon/common.bash @@ -1,3 +1,4 @@ #!/usr/bin/env bash reload_fifo="/tmp/treehouse_reload.fifo" +build_log="/tmp/treehouse_build.log" diff --git a/admin/daemon/deploy.bash b/admin/daemon/deploy.bash index fd4f4c3..fee15c0 100644 --- a/admin/daemon/deploy.bash +++ b/admin/daemon/deploy.bash @@ -1,5 +1,11 @@ #!/usr/bin/env bash cd ~/repo + +source "${BASH_SOURCE%/*}/common.bash" + git pull bash "${BASH_SOURCE%/*}/reload.bash" + +echo "^C to exit build log ($build_log)" +tail --retry -f "$build_log" diff --git a/admin/daemon/reload.bash b/admin/daemon/reload.bash index d89f142..958a518 100644 --- a/admin/daemon/reload.bash +++ b/admin/daemon/reload.bash @@ -2,4 +2,5 @@ source "${BASH_SOURCE%/*}/common.bash" +echo "Reloading" echo "reload" > "$reload_fifo"