X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Frun_cpta.sh;h=1aa570316202a14907644c13be103175e9d2cd49;hb=7a26d43c4f71869695ba19ce58f9afac9a1d176d;hp=233e8dfbe293941bc5acdb590578e1048ae57363;hpb=efdcf6470f6e15dcc918c70e5a61d10e10653f1e;p=csit.git

diff --git a/resources/tools/presentation/run_cpta.sh b/resources/tools/presentation/run_cpta.sh
index 233e8dfbe2..1aa5703162 100755
--- a/resources/tools/presentation/run_cpta.sh
+++ b/resources/tools/presentation/run_cpta.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set +x
+set -x
 
 # set default values in config array
 typeset -A DIR
@@ -12,26 +12,23 @@ sudo apt-get -y update
 sudo apt-get -y install libxml2 libxml2-dev libxslt-dev build-essential \
     zlib1g-dev unzip
 
-# Clean-up when finished
-trap 'rm -rf ${DIR[WORKING]}; exit' EXIT
-trap 'rm -rf ${DIR[WORKING]}; exit' ERR
-
 # Create working directories
 mkdir ${DIR[WORKING]}
 
 # Create virtual environment
-virtualenv ${DIR[WORKING]}/env
-. ${DIR[WORKING]}/env/bin/activate
+virtualenv -p $(which python3) ${DIR[WORKING]}/env
+source ${DIR[WORKING]}/env/bin/activate
 
 # Install python dependencies:
-pip install -r requirements.txt
+pip3 install -r requirements.txt
 
-export PYTHONPATH=`pwd`
+export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python
 
-python pal.py \
+STATUS=$(python pal.py \
     --specification specification_CPTA.yaml \
     --logging INFO \
-    --force
+    --force)
+RETURN_STATUS=$?
 
-RETURN_STATUS=$(echo $?)
+echo ${STATUS}
 exit ${RETURN_STATUS}