changing package to use setup.py install

1 files changed, 3 insertions, 13 deletions

diff --git a/package/package_user_agent.sh b/package/package_user_agent.sh
index a532abe7..c4bcec0f 100755
--- a/package/package_user_agent.sh
+++ b/package/package_user_agent.sh
@@ -21,19 +21,14 @@ set -e
 PACKAGE_VERSION="$1"
 BUILD_PATH=/tmp/pix-user-agent-build
 PIXELATED_LIB_PATH=$BUILD_PATH/var/lib/pixelated
-PIXELATED_WEB_LIB_PATH=$PIXELATED_LIB_PATH/web-ui/app
 PIXELATED_VIRTUALENV_PATH=$PIXELATED_LIB_PATH/virtualenv
-BIN_PATH=$BUILD_PATH/usr/local/bin
 
 # create build folder
 [[ ! -d "$BUILD_PATH" ]] && mkdir $BUILD_PATH
 rm -rf $BUILD_PATH/*
 
 # create internal folders
-mkdir -p $BIN_PATH
 mkdir -p $PIXELATED_LIB_PATH
-mkdir -p $PIXELATED_WEB_LIB_PATH
-mkdir -p $BUILD_PATH
 
 # build web-ui code
 cd web-ui
@@ -43,19 +38,16 @@ node_modules/bower/bin/bower install
 ./go package
 cd ..
 
-# copy code
-cp -rf service $PIXELATED_LIB_PATH
-cp -rf web-ui/dist/* $PIXELATED_WEB_LIB_PATH
-
 # build virtual env
 cd service
 virtualenv $PIXELATED_VIRTUALENV_PATH
 . $PIXELATED_VIRTUALENV_PATH/bin/activate
 pip install --upgrade pip
 pip install --upgrade setuptools
-python setup.py develop
-rm $PIXELATED_VIRTUALENV_PATH/bin/pixelated-user-agent
+python setup.py develop --always-unzip
+python setup.py install
 deactivate
+
 cd $PIXELATED_VIRTUALENV_PATH
 for file in $(grep -l '/tmp/pix-user-agent-build' bin/*); do 
         sed -i 's|/tmp/pix-user-agent-build||' $file;
@@ -63,8 +55,6 @@ done
 cd -
 cd ..
 
-cp package/pixelated-user-agent $BIN_PATH
-
 cd $BUILD_PATH
 [[ ! -f '/tmp/gems/bin/fpm' ]] && GEM_HOME=/tmp/gems gem install fpm
 GEM_HOME=/tmp/gems /tmp/gems/bin/fpm -s dir -v ${PACKAGE_VERSION} -t deb -n pixelated-user-agent -C . .