From c729f6cf8bd73c8da7a58bd688f402f4e538bbaa Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Mon, 17 Nov 2014 08:11:21 +0000
Subject: [PATCH] fix directories detection function
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6019 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/SCRIPTS/utils.bash | 39 ++++++++++++-----------------------
1 file changed, 13 insertions(+), 26 deletions(-)
diff --git a/openair-cn/SCRIPTS/utils.bash b/openair-cn/SCRIPTS/utils.bash
index 1f2f9c9ea4..049daf9206 100755
--- a/openair-cn/SCRIPTS/utils.bash
+++ b/openair-cn/SCRIPTS/utils.bash
@@ -161,32 +161,19 @@ 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
- declare -x OPENAIR_DIR
- 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/*}
+ openair_path=${openair_path%/openair-cn/*}
+ openair_path=${openair_path%/openair[123]/*}
+
+ 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
}
wait_process_started () {
--
GitLab