Deploy hydra on /usr/local/bin (3)

diff --git a/share/hydra/deploy b/share/hydra/deploy
index 35b0604b62a4daa072a868b81449bc7b2c8807f5..dfef90f7e5772ed7c6625f8e4aa268f277a41393 100755 (executable)
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -47,19 +47,21 @@ 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/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.
-    sudo rm /usr/local/sbin/hydra
-    sudo rm /usr/local/sbin/hydractl
-    sudo rm /usr/local/sbin/hydras
   else
     ( cd /usr/local/hydra ; sudo git pull ; sudo git reset --hard $COMMIT )
   fi
   ##### END REMOTE SCRIPT #######
+
+  # Update symlinks
+  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.
+  sudo rm /usr/local/sbin/hydra
+  sudo rm /usr/local/sbin/hydractl
+  sudo rm /usr/local/sbin/hydras
 EOF
 done

diff --git a/share/hydractl/deploy b/share/hydractl/deploy
index 969a557047e2378a81364a0a9ec57d93b88f0121..5dc188a67f9bf9dc775987d490be425607d96e2d 100755 (executable)
--- a/share/hydractl/deploy
+++ b/share/hydractl/deploy
@@ -42,16 +42,18 @@ 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/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.
-  $sudo rm /usr/local/sbin/hydra
-  $sudo rm /usr/local/sbin/hydractl
-  $sudo rm /usr/local/sbin/hydras
 else
   ( cd /usr/local/hydra ; $sudo git pull ; $sudo git reset --hard $COMMIT )
 fi
+
+# Update symlinks
+$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.
+$sudo rm -f /usr/local/sbin/hydra
+$sudo rm -f /usr/local/sbin/hydractl
+$sudo rm -f /usr/local/sbin/hydras