Install: removes git way, but keep package installation

diff --git a/doc/install.rst b/doc/install.rst
index 1bf8f017e749700701e67903b9987b4bc2a6a28a..e92b9d8efac5d83531fa9c32e7090d0ce55b74ae 100644 (file)
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -28,3 +28,4 @@ Major direct upstreams:
 
 * `Debian <https://www.debian.org>`_ 
 * `Puppet <http://docs.puppetlabs.com>`_
+* `Git <https://git-scm.com/>`_

diff --git a/share/hydractl/install b/share/hydractl/install
index 4e058489ef459f9bdffafaf83eb080e96f78f161..fb7f0b95d815be2a7f5ce13ad87a2108791c30f9 100755 (executable)
--- a/share/hydractl/install
+++ b/share/hydractl/install
@@ -25,24 +25,12 @@ if [ "`whoami`" != 'root' ]; then
   sudo="sudo"
 fi
 
-# Deploy, git version
-#
-#if ! which git &> /dev/null; then
-#  echo "Installing git..."
-#  $sudo apt-get update
-#  $sudo apt-get install git -y
-#fi
-#
-#if [ -z "$ORIGIN" ]; then
-#  ORIGIN="git://git.fluxo.info/hydra.git"
-#fi
-#
-#if [ ! -d /usr/local/share/hydra ]; then
-#  $sudo git clone $ORIGIN /usr/local/share/hydra
-#  ( cd /usr/local/share/hydra ; $sudo git reset --hard $COMMIT )
-#else
-#  ( cd /usr/local/share/hydra ; $sudo git pull ; $sudo git reset --hard $COMMIT )
-#fi
+# Check for git
+if ! which git &> /dev/null; then
+  echo "Installing git..."
+  $sudo apt-get update
+  $sudo apt-get install git -y
+fi
 
 # Deploy, rsync version
 if [ "$APP_BASE" != "/usr/local/share/hydra" ]; then