summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xshare/hydra/deploy13
-rwxr-xr-xshare/hydractl/deploy13
2 files changed, 20 insertions, 6 deletions
diff --git a/share/hydra/deploy b/share/hydra/deploy
index a41040d..50b84b9 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -47,9 +47,16 @@ 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 -sf /usr/local/hydra/hydra /usr/local/sbin/hydra
- sudo ln -sf /usr/local/hydra/hydra /usr/local/sbin/hydractl
- sudo ln -sf /usr/local/hydra/hydras /usr/local/sbin/hydras
+ sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydra
+ sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydractl
+ sudo ln -sf /usr/local/hydra/hydras /usr/local/bin/hydras
+
+ # Remove from old location
+ # We're keep hydra on /usr/local/bin as /usr/local/sbin might
+ # not be available on $PATH when connecting to a remote system.
+ rm /usr/local/sbin/hydra
+ rm /usr/local/sbin/hydractl
+ rm /usr/local/sbin/hydras
else
( cd /usr/local/hydra ; sudo git pull ; sudo git reset --hard $COMMIT )
fi
diff --git a/share/hydractl/deploy b/share/hydractl/deploy
index 588c9e6..3b4ae91 100755
--- a/share/hydractl/deploy
+++ b/share/hydractl/deploy
@@ -42,9 +42,16 @@ fi
if [ ! -d /usr/local/hydra ]; then
$sudo git clone $ORIGIN /usr/local/hydra
( cd /usr/local/hydra ; $sudo git reset --hard $COMMIT )
- $sudo ln -sf /usr/local/hydra/hydra /usr/local/sbin/hydra
- $sudo ln -sf /usr/local/hydra/hydra /usr/local/sbin/hydractl
- $sudo ln -sf /usr/local/hydra/hydras /usr/local/sbin/hydras
+ $sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydra
+ $sudo ln -sf /usr/local/hydra/hydra /usr/local/bin/hydractl
+ $sudo ln -sf /usr/local/hydra/hydras /usr/local/bin/hydras
+
+ # Remove from old location
+ # We're keep hydra on /usr/local/bin as /usr/local/sbin might
+ # not be available on $PATH when connecting to a remote system.
+ rm /usr/local/sbin/hydra
+ rm /usr/local/sbin/hydractl
+ rm /usr/local/sbin/hydras
else
( cd /usr/local/hydra ; $sudo git pull ; $sudo git reset --hard $COMMIT )
fi