From 5cd4801694b62da333c16dce79064f841a2a5e05 Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Mon, 17 Nov 2014 08:03:11 +0000
Subject: [PATCH] Fix initial directories setup
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6018 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
targets/PROJECTS/GENERIC-LTE-EPC/utils.bash | 37 +++++++--------------
1 file changed, 12 insertions(+), 25 deletions(-)
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
index 62964243e5..ec42b1354c 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
@@ -177,31 +177,18 @@ rotate_log_file () {
}
set_openair() {
- path=`pwd`
- declare -i length_path
- declare -i index
- length_path=${#path}
-
- for i in 'openair1' 'openair2' 'openair3' 'openair-cn' 'targets'
- do
- index=`echo $path | grep -b -o $i | cut -d: -f1`
- #echo ${path%$token*}
- if [[ $index -lt $length_path && index -gt 0 ]]
- then
- index=`expr $index - 1`
- openair_path=`echo $path | cut -c1-$index`
- #openair_path=`echo ${path:0:$index}`
- export OPENAIR_DIR=$openair_path
- export OPENAIR_HOME=$openair_path
- export OPENAIR1_DIR=$openair_path/openair1
- export OPENAIR2_DIR=$openair_path/openair2
- export OPENAIR3_DIR=$openair_path/openair3
- export OPENAIRCN_DIR=$openair_path/openair-cn
- export OPENAIR_TARGETS=$openair_path/targets
- return 0
- fi
- done
- return -1
+ fullpath=`readlink -f $BASH_SOURCE`
+ [ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath`
+ openair_path=${fullpath%/targets/*}
+
+ export OPENAIR_DIR=$openair_path
+ export OPENAIR_HOME=$openair_path
+ export OPENAIR1_DIR=$openair_path/openair1
+ export OPENAIR2_DIR=$openair_path/openair2
+ export OPENAIR3_DIR=$openair_path/openair3
+ export OPENAIRCN_DIR=$openair_path/openair-cn
+ export OPENAIR_TARGETS=$openair_path/targets
+ export CDPATH=$CDPATH:$openair_path
}
wait_process_started () {
--
GitLab