diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-21 11:28:12 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-21 11:28:12 -0300 |
| commit | 6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d (patch) | |
| tree | 4e9745c0c73d74cb85fe91e1113f20652bb9c4f8 /share/hydra/install | |
| parent | e40b3514e041a4bb2aac962b639c947333365b4b (diff) | |
| parent | 8addf3ea71f50050a791e618bd4511860264c0de (diff) | |
| download | hydra-6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d.tar.gz hydra-6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d.tar.bz2 | |
Merge branch 'master' into develop
Conflicts:
TODO.md
share/hydra/install
share/hydra/mass
share/hydractl/bootstrap
share/hydractl/puppet-enable
share/hydractl/system-upgrade
Diffstat (limited to 'share/hydra/install')
| -rwxr-xr-x | share/hydra/install | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/share/hydra/install b/share/hydra/install index 6a3c07f..00154b7 100755 --- a/share/hydra/install +++ b/share/hydra/install @@ -28,15 +28,14 @@ if [ -z "$NODES" ]; then NODES="`hydra $HYDRA nodes`" fi -# Validation -if [ -z "$ORIGIN" ]; then - ORIGIN="git://git.fluxo.info/hydra.git" -else - ORIGIN_CONFIG="`hydra $HYDRA config git`" +# Get origin +ORIGIN_CONFIG="`hydra $HYDRA config git`" - if [ ! -z "$ORIGIN_CONFIG" ]; then - ORIGIN="$ORIGIN_CONFIG/hydra.git" - fi +# Validate origin +if [ ! -z "$ORIGIN_CONFIG" ]; then + ORIGIN="$ORIGIN_CONFIG/hydra.git" +else + ORIGIN="git://git.fluxo.info/hydra.git" fi # Deploy |