diff --git a/openair-cn/SCRIPTS/utils.bash b/openair-cn/SCRIPTS/utils.bash index 1f2f9c9ea4943bcdc84eb72d9ccc1acfbc8849c7..049daf9206260565b0c0fd79752065117070625b 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 () {