diff --git a/targets/PROJECTS/SPECTRA/build_all.bash b/targets/PROJECTS/SPECTRA/build_all.bash index 64bbb5c87d01d68c9de471a48640039a22fff5ec..849dccaa54fcfe5863d6db347e855fc1ea6b47f4 100755 --- a/targets/PROJECTS/SPECTRA/build_all.bash +++ b/targets/PROJECTS/SPECTRA/build_all.bash @@ -29,9 +29,9 @@ test_install_package linux-headers-`uname -r` test_install_package "tshark" "--force-yes" # for ODTONE git clone test_install_package "git" - + test_install_asn1c_4_rrc_cellular - + echo_success "\n###############################" echo_success "# COMPILE oaisim" diff --git a/targets/PROJECTS/SPECTRA/env_802dot21.bash b/targets/PROJECTS/SPECTRA/env_802dot21.bash index 0a8efd0145d6daea89d9adc6a658b878184a1aef..0ba86e881d398f7ca22c8aa5c46caabe619c3caa 100755 --- a/targets/PROJECTS/SPECTRA/env_802dot21.bash +++ b/targets/PROJECTS/SPECTRA/env_802dot21.bash @@ -25,7 +25,7 @@ export UE_MIH_USER_CONF_FILE=ue_lte_user.conf ENV_SCRIPT_SOURCED="?" ENV_SCRIPT_ERRORS="no" -if [[ $BASH_SOURCE != $0 ]]; then +if [[ $BASH_SOURCE != $0 ]]; then THIS_SCRIPT_PATH=${BASH_SOURCE%env_802dot21.bash} [[ x"$THIS_SCRIPT_PATH" == x ]] && THIS_SCRIPT_PATH="./" ENV_SCRIPT_SOURCED="yes" @@ -46,7 +46,7 @@ if [ ! -d $BOOST_ROOT ]; then ENV_SCRIPT_ERRORS="yes" else command -v b2 >/dev/null 2>&1 - if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then echo_warning "Program b2 is not installed or not in the PATH variable. Trying to resolve..." >&2 if [[ -x "$BOOST_ROOT/b2" ]]; then echo_success "Program b2 found in dir $BOOST_ROOT." >&2 @@ -58,7 +58,7 @@ else export PATH=$PATH:$BOOST_ROOT fi command -v $BOOST_ROOT/b2 >/dev/null 2>&1 - if [ $? -eq 0 ]; then + if [ $? -eq 0 ]; then echo_success "Program b2 is now reachable by the PATH variable during the execution of this script." >&2 else echo_error "Built of b2 failed. Please help yourself" >&2 diff --git a/targets/PROJECTS/SPECTRA/start_enb.bash b/targets/PROJECTS/SPECTRA/start_enb.bash index 3235af06b5ab3d052512ceea6f3fe75bf244e810..4f7216d68889c42bd06ce09cae333d9c5a181e9f 100755 --- a/targets/PROJECTS/SPECTRA/start_enb.bash +++ b/targets/PROJECTS/SPECTRA/start_enb.bash @@ -110,7 +110,7 @@ ENB_MIHF_ID=`cat $ODTONE_MIH_EXE_DIR/$ENB_MIH_F_CONF_FILE | grep id | grep \= | #remove 2 last digits (vitualization, index on 2 digits) ENB_RAL_LINK_ID_STRIPPED=${ENB_RAL_LINK_ID%%??} -#xterm -hold -e gdb --args +#xterm -hold -e gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim -a -K $LOG_FILE -l9 -u0 -b1 -M0 -p2 -g1 -D $EMULATION_DEV_INTERFACE \ --enb-ral-listening-port $ENB_RAL_LISTENING_PORT \ --enb-ral-link-id $ENB_RAL_LINK_ID_STRIPPED \ @@ -123,7 +123,7 @@ wait_process_started oaisim # start MIH-USER # wait for emulation start -tshark -c 500 -i $EMULATION_DEV_INTERFACE > /dev/null 2>&1 +tshark -c 500 -i $EMULATION_DEV_INTERFACE > /dev/null 2>&1 #xterm -hold -e $ODTONE_MIH_EXE_DIR/$ENB_MIH_USER --conf.file $ODTONE_MIH_EXE_DIR/$ENB_MIH_USER_CONF_FILE & #wait_process_started $ENB_MIH_USER diff --git a/targets/PROJECTS/SPECTRA/utils.bash b/targets/PROJECTS/SPECTRA/utils.bash index ff4802087e0da7c3a1c5f27398e6b8f3bca9bf6a..724d9f5089bc5192ca52773479304a2ea0925d45 100755 --- a/targets/PROJECTS/SPECTRA/utils.bash +++ b/targets/PROJECTS/SPECTRA/utils.bash @@ -41,7 +41,7 @@ trim () echo "$1" | sed -n '1h;1!H;${;g;s/^[ \t]*//g;s/[ \t]*$//g;p;}' } -trim2() +trim2() { local var=$@ var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters