openstack
/
rally
Code Issues Proposed changes

Merge "Do not remove SOURCEDIR in install_rally.sh"

This commit is contained in:
Jenkins 2016-01-05 17:09:50 +00:00 committed by Gerrit Code Review
parent d955183ea2 66accdb1d4
commit 2667723fab
1 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
install_rally.sh
View File

@ -710,19 +710,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' ]
@ -732,29 +719,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 ..."
@ -806,16 +770,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==============================
@ -847,14 +806,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