diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2019-04-19 19:01:09 +0200 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2019-04-19 19:01:09 +0200 |
| commit | 92a9466dc83dc9a730bf9be7bdcb2b713c69987e (patch) | |
| tree | 5ab45983134d57d7dfc277e905f7e17a056133a1 | |
| parent | 27044c97b8d7e452c1a14babf1bb725448682961 (diff) | |
| download | deployment-92a9466dc83dc9a730bf9be7bdcb2b713c69987e.tar.gz deployment-92a9466dc83dc9a730bf9be7bdcb2b713c69987e.tar.bz2 deployment-92a9466dc83dc9a730bf9be7bdcb2b713c69987e.zip | |
whoami instead of env.
| -rwxr-xr-x | buildbot/build.sh | 6 | ||||
| -rwxr-xr-x | buildbot/config.sh | 6 | ||||
| -rwxr-xr-x | buildbot/keys.sh | 6 | ||||
| -rwxr-xr-x | buildbot/restart.sh | 6 | ||||
| -rwxr-xr-x | buildbot/sign.sh | 6 | ||||
| -rwxr-xr-x | buildbot/top_reserve.sh | 8 |
6 files changed, 13 insertions, 25 deletions
diff --git a/buildbot/build.sh b/buildbot/build.sh index 33f764c..4e5f22c 100755 --- a/buildbot/build.sh +++ b/buildbot/build.sh @@ -1,9 +1,6 @@ #!/bin/bash -source "${HOME}/activate" -ACTIVE_COLOR="$(cat /home/test/active)" - -if test "${TALER_ENV_COLOR}" = "${ACTIVE_COLOR}"; then +if test "$(whoami)" = "$(cat /home/test/active)"; then echo "I'm the active color, no need to compile and switch!" exit 0 fi @@ -17,4 +14,5 @@ echo "The Buildbot is paused, remove ${PAUSE_LOCKFILE} to resume." exit 2 fi +source "${HOME}/activate" taler-deployment-build diff --git a/buildbot/config.sh b/buildbot/config.sh index 0c42ebf..289ce1a 100755 --- a/buildbot/config.sh +++ b/buildbot/config.sh @@ -1,11 +1,9 @@ #!/bin/bash -source "${HOME}/activate" -ACTIVE_COLOR="$(cat /home/test/active)" - -if test "${TALER_ENV_COLOR}" = "${ACTIVE_COLOR}"; then +if test "$(whoami)" = "$(cat /home/test/active)"; then echo "I'm the active color, no need to compile and switch!" exit 0 fi +source "${HOME}/activate" taler-deployment-config-generate diff --git a/buildbot/keys.sh b/buildbot/keys.sh index ddfa4be..5556091 100755 --- a/buildbot/keys.sh +++ b/buildbot/keys.sh @@ -1,11 +1,9 @@ #!/bin/bash -source "${HOME}/activate" -ACTIVE_COLOR="$(cat /home/test/active)" - -if test "${TALER_ENV_COLOR}" = "${ACTIVE_COLOR}"; then +if test "$(whoami)" = "$(cat /home/test/active)"; then echo "I'm the active color, no need to compile and switch!" exit 0 fi +source "${HOME}/activate" taler-deployment-keyup diff --git a/buildbot/restart.sh b/buildbot/restart.sh index a57a2f3..6faa6a2 100755 --- a/buildbot/restart.sh +++ b/buildbot/restart.sh @@ -1,11 +1,9 @@ #!/bin/bash -source "${HOME}/activate" -ACTIVE_COLOR="$(cat /home/test/active)" - -if test "${TALER_ENV_COLOR}" = "${ACTIVE_COLOR}"; then +if test "$(whoami)" = "$(cat /home/test/active)"; then echo "I'm the active color, no need to compile and switch!" exit 0 fi +source "${HOME}/activate" taler-deployment-restart diff --git a/buildbot/sign.sh b/buildbot/sign.sh index 456db77..4b31229 100755 --- a/buildbot/sign.sh +++ b/buildbot/sign.sh @@ -1,11 +1,9 @@ #!/bin/bash -source "${HOME}/activate" -ACTIVE_COLOR="$(cat /home/test/active)" - -if test "${TALER_ENV_COLOR}" = "${ACTIVE_COLOR}"; then +if test "$(whoami)" = "$(cat /home/test/active)"; then echo "I'm the active color, no need to compile and switch!" exit 0 fi +source "${HOME}/activate" taler-deployment-config-sign diff --git a/buildbot/top_reserve.sh b/buildbot/top_reserve.sh index 0c1e5d1..fff605d 100755 --- a/buildbot/top_reserve.sh +++ b/buildbot/top_reserve.sh @@ -1,11 +1,9 @@ #!/bin/bash -source "${HOME}/activate" -ACTIVE_COLOR="$(cat /home/test/active)" - -if ! test "${TALER_ENV_COLOR}" = "${ACTIVE_COLOR}"; then - echo "I'm the inactive color (${TALER_ENV_COLOR}), will not top the reserve up!" +if ! test "$(whoami)" = "$(cat /home/test/active)"; then + echo "I'm the inactive color, will not top the reserve up!" exit 0 fi +source "${HOME}/activate" taler-deployment-top-reserve |