From 66accdb1d47e0416353640f4aff1771b7a5e0c33 Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Thu, 17 Dec 2015 23:30:58 +0100
Subject: [PATCH] Do not remove SOURCEDIR in install_rally.sh

Co-Authored-By: Oleh Anufriiev <oanufriev@mirantis.com>
Change-Id: Ic7eac45455185c6ba18caf40ba39ecea845f366d
---
 install_rally.sh | 53 ++----------------------------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/install_rally.sh b/install_rally.sh
index 4a05da8281..7b38970a63 100755
--- a/install_rally.sh
+++ b/install_rally.sh
@@ -706,19 +706,6 @@ then
         echo "Warning! Unable to wipe python compiled files"
     fi
 
-    if [ "$USEVIRTUALENV" = 'yes' ]
-    then
-        if [ "$VENVDIR/src" != "$BASEDIR" ]
-        then
-            SOURCEDIR="$VENVDIR"/src
-            if [ -d $SOURCEDIR ]
-            then
-                rm -rf $SOURCEDIR
-            fi
-            mkdir $SOURCEDIR
-            cp -r . $SOURCEDIR/
-        fi
-    fi
     popd > /dev/null
 else
     if [ "$USEVIRTUALENV" = 'yes' ]
@@ -728,29 +715,6 @@ else
         SOURCEDIR="$ORIG_WD"/rally.git
     fi
 
-    # Check if source directory is present
-    if [ -d "$SOURCEDIR" ]
-    then
-        if [ $RECREATEDEST != 'yes' ]
-        then
-            echo "Source directory '$SOURCEDIR' already exists."
-            echo "I can wipe it out in order to make a new installation,"
-            echo "but this means any files in that directory, and the ones"
-            echo "underneath it will be deleted."
-            echo
-            if ! ask_yn "Do you want to wipe the source directory '$SOURCEDIR'?"
-            then
-                echo "*Not* overwriting destination directory '$SOURCEDIR'."
-            else
-                rm -rf $SOURCEDIR
-                if [ -d "$SOURCEDIR"/.git ]
-                then
-                    abort $EX_CANTCREAT "Unable to wipe source directory $SOURCEDIR"
-                fi
-            fi
-        fi
-    fi
-
     if ! [ -d "$SOURCEDIR"/.git ]
     then
         echo "Downloading Rally from subversion repository $RALLY_GIT_URL ..."
@@ -802,16 +766,11 @@ __EOF__
         SAMPLESDIR=$VENVDIR/samples
         mkdir -p $SAMPLESDIR
         cp -r $SOURCEDIR/samples/* $SAMPLESDIR/
-        if [ "$BASEDR" != "$SOURCEDIR" ]
-        then
-            rm -rf $SOURCEDIR
-            echo "Source directory is removed."
-        else
-            echo "Unabled to remove source directory, becaus this script was started from it."
-        fi
     else
         SAMPLESDIR=$SOURCEDIR/samples
     fi
+    mkdir -p $VENVDIR/etc/bash_completion.d
+    install $SOURCEDIR/etc/rally.bash_completion $VENVDIR/etc/bash_completion.d/
 
     cat <<__EOF__
 $GREEN==============================
@@ -843,14 +802,6 @@ else
         SAMPLESDIR=/usr/share/rally/samples
         mkdir -p $SAMPLESDIR
         cp -r $SOURCEDIR/samples/* $SAMPLESDIR/
-        if [ "$BASEDIR" != "$SOURCEDIR" ]
-        then
-            rm -rf $SOURCEDIR
-            echo "Source directory is removed."
-        else
-            echo "Unabled to remove source directory, because this script was started from it."
-
-        fi
     else
         SAMPLESDIR=$SOURCEDIR/samples
     fi