From 3e07c2315edb40795af0cb3867e3a366da2e8488 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 8 Apr 2014 15:17:32 -0300
Subject: Deploy hydra on /usr/local/bin (3)

---
 share/hydra/deploy    | 22 ++++++++++++----------
 share/hydractl/deploy | 22 ++++++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'share')

diff --git a/share/hydra/deploy b/share/hydra/deploy
index 35b0604..dfef90f 100755
--- 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 969a557..5dc188a 100755
--- 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
-- 
cgit v1.2.3