Deploy hydra on /usr/local/bin

diff --git a/share/hydra/deploy b/share/hydra/deploy
index a41040d927a663fe6c4c5ce22a69cbc02745401a..50b84b9d5eeaac994aa42fa8c3ffd456fb2a3707 100755 (executable)
--- 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 588c9e6beb40380b97b8aac62ac94e03a06777cd..3b4ae91744778ad01ddafe4615ee7fe943111b81 100755 (executable)
--- 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