From 7dda52c3624342378614a84a3f2bd5d0a37edc9a Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 16 Jun 2016 16:24:54 -0300 Subject: Install: removes git way, but keep package installation --- doc/install.rst | 1 + share/hydractl/install | 24 ++++++------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/doc/install.rst b/doc/install.rst index 1bf8f01..e92b9d8 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -28,3 +28,4 @@ Major direct upstreams: * `Debian `_ * `Puppet `_ +* `Git `_ diff --git a/share/hydractl/install b/share/hydractl/install index 4e05848..fb7f0b9 100755 --- 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 -- cgit v1.2.3