aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-11-14 11:07:45 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-11-14 11:07:45 -0200
commitbdebb365243d1ec929936c28fe443d81bb71624a (patch)
tree0a36c4a8159a6064e2d8ddeaddfcd45ca3b3c755
parentd5832da2a88b6afb8aa964a7b787368853119592 (diff)
downloadhydra-bdebb365243d1ec929936c28fe443d81bb71624a.tar.gz
hydra-bdebb365243d1ec929936c28fe443d81bb71624a.tar.bz2
Lib loading and deploy fixes
-rwxr-xr-xhydra1
-rwxr-xr-xshare/hydra/deploy5
2 files changed, 6 insertions, 0 deletions
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 )