From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 14 Nov 2010 13:07:45 +0000 (-0200)
Subject: Lib loading and deploy fixes
X-Git-Tag: 0.1~386
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bdebb365243d1ec929936c28fe443d81bb71624a;p=hydra.git

Lib loading and deploy fixes
---

diff --git a/hydra b/hydra
index 1b80f69..53c4a64 100755
--- a/hydra
+++ b/hydra
@@ -33,6 +33,7 @@ function hydra_load {
       dest="$(dirname $(readlink $dest))"
     else
       base="`dirname $0`"
+      dest="`dirname $dest`"
     fi
 
     # Deal with relative or absolute links
diff --git a/share/hydra/deploy b/share/hydra/deploy
index bf3f312..11bd914 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -24,6 +24,11 @@ for node in $NODES; do
   echo "Deploying to $node..."
   ssh -o ConnectTimeout=15 $node <<EOF
   ##### BEGIN REMOTE SCRIPT #####
+  if ! which git; then
+    echo "Installing git..."
+    sudo aptitude install git-core -y || exit 1
+  fi
+
   if [ ! -d /usr/local/hydra ]; then
     sudo git clone $ORIGIN /usr/local/hydra
     ( cd /usr/local/hydra ; sudo git reset --hard $COMMIT )