From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 25 Apr 2017 13:33:26 +0000 (+0200)
Subject: Change in install-openmano to delete openvim folder from the appropriate location
X-Git-Tag: v2.0.0~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=52d643d76c7c93de002439102796a9af11ef0abe;p=osm%2FRO.git

Change in install-openmano to delete openvim folder from the appropriate location

Change-Id: I60708f65b27924def97a92a79f682c31f2a95d57
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index de8a8929..ae4dd3c5 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -257,12 +257,12 @@ echo '
 #################################################################'
 su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER} clone ${GIT_OVIM_URL} openvim"
 [[ -z $DEVELOP ]] && su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER}/openvim checkout v2.0"
-trap 'rm -rf "${OPENMANO_BASEFOLDER}/openvim"' EXIT
 
 # Install debian dependencies before setup.py
 [ "$_DISTRO" == "Ubuntu" ] && install_packages "libmysqlclient-dev"
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "libmysqlclient-dev"  #TODO check if that's the name in CentOS and RedHat
 make -C ${OPENMANO_BASEFOLDER}/openvim lite
+rm -rf "${OPENMANO_BASEFOLDER}/openvim"
 OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'`
 
 if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]