openstack
/
murano
Code Issues Proposed changes

Fixed setup.sh 

Change-Id: I303e8e0a06d1e884595f7a6bf28a44d620597f15
This commit is contained in:
Timur Nurlygayanov 2013-06-14 06:26:21 -04:00
parent 851ea444e6
commit ddca1122ab
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup.sh
View File

@ -93,7 +93,7 @@ CLONE_FROM_GIT=$1
# Setupping...
log "Running setup.py"
MRN_CND_SPY=$GIT_CLONE_DIR/$SERVICE_SRV_NAME/setup.py
MRN_CND_SPY=$GIT_CLONE_DIR/setup.py
if [ -e $MRN_CND_SPY ]; then
chmod +x $MRN_CND_SPY
log "$MRN_CND_SPY output:_____________________________________________________________"
@ -104,14 +104,14 @@ CLONE_FROM_GIT=$1
#fi
## Setup through pip
# Creating tarball
cd $GIT_CLONE_DIR/$SERVICE_SRV_NAME && $MRN_CND_SPY sdist
cd $GIT_CLONE_DIR/ && $MRN_CND_SPY sdist
if [ $? -ne 0 ];then
log "\"$MRN_CND_SPY\" tarball creation FAILS, exiting!!!"
exit 1
fi
# Running tarball install
TRBL_FILE=$(basename `ls $GIT_CLONE_DIR/$SERVICE_SRV_NAME/dist/*.tar.gz`)
pip install $GIT_CLONE_DIR/$SERVICE_SRV_NAME/dist/$TRBL_FILE
TRBL_FILE=$(basename `ls $GIT_CLONE_DIR/dist/*.tar.gz`)
pip install $GIT_CLONE_DIR/dist/$TRBL_FILE
if [ $? -ne 0 ];then
log "pip install \"$TRBL_FILE\" FAILS, exiting!!!"
exit 1
@ -130,9 +130,9 @@ CLONE_FROM_GIT=$1
fi
# making sample configs
log "Making sample configuration files at \"$ETC_CFG_DIR\""
for file in `ls $GIT_CLONE_DIR/$SERVICE_SRV_NAME/etc`
for file in `ls $GIT_CLONE_DIR/etc`
do
cp -f "$GIT_CLONE_DIR/$SERVICE_SRV_NAME/etc/$file" "$ETC_CFG_DIR/$file.sample"
cp -f "$GIT_CLONE_DIR/etc/$file" "$ETC_CFG_DIR/$file.sample"
done
}