diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-11-14 11:10:25 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-11-14 11:10:25 -0200 |
| commit | 347cca10fef9263bf1dd75b34123ec839de7166b (patch) | |
| tree | 8694b82c3c129503f7502453ac221989d54cc248 | |
| parent | bdebb365243d1ec929936c28fe443d81bb71624a (diff) | |
| download | hydra-347cca10fef9263bf1dd75b34123ec839de7166b.tar.gz hydra-347cca10fef9263bf1dd75b34123ec839de7166b.tar.bz2 | |
Deploy fixes
| -rwxr-xr-x | share/hydra/deploy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/hydra/deploy b/share/hydra/deploy index 11bd914..635515a 100755 --- a/share/hydra/deploy +++ b/share/hydra/deploy @@ -9,7 +9,7 @@ hydra_config_load # Command line arguments ORIGIN="$1" -COMMIT="d5fcbe970289d8246e6e3db4249a0bb6dc75cfb8" +COMMIT="bdebb365243d1ec929936c28fe443d81bb71624a" # Build node list NODES="`hydra $HYDRA nodes`" @@ -24,7 +24,7 @@ for node in $NODES; do echo "Deploying to $node..." ssh -o ConnectTimeout=15 $node <<EOF ##### BEGIN REMOTE SCRIPT ##### - if ! which git; then + if ! which git &> /dev/null; then echo "Installing git..." sudo aptitude install git-core -y || exit 1 fi @@ -32,8 +32,8 @@ for node in $NODES; do if [ ! -d /usr/local/hydra ]; then sudo git clone $ORIGIN /usr/local/hydra ( cd /usr/local/hydra ; sudo git reset --hard $COMMIT ) - sudo ln -s /usr/local/hydra/hydra /usr/local/sbin/hydra - sudo ln -s /usr/local/hydra/hydra /usr/local/sbin/hydractl + sudo ln -sf /usr/local/hydra/hydra /usr/local/sbin/hydra + sudo ln -sf /usr/local/hydra/hydra /usr/local/sbin/hydractl else ( cd /usr/local/hydra ; sudo git pull ; sudo git reset --hard $COMMIT ) fi |