Lib loading and deploy fixes

diff --git a/hydra b/hydra
index 1b80f696597a35faf20407632269a94eab441e02..53c4a642e0dac3251dd7b27101f60489ec976fd6 100755 (executable)
--- 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 bf3f312e5d66e1b034c69efc0c5e5a96a143cedb..11bd914ddd45a1442cfb0fbb39af00a1cb2f8994 100755 (executable)
--- 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 )