agent: Fix empties paths

Signed-off-by: Edileuton Henrique de Oliveira <eho09@c3sl.ufpr.br>

agent/bin/datasid-agent.sh

@@ -159,7 +159,7 @@ if test ${updateStatus} -ne 0; then
 fi
 
 # Download telecentroInfo from webservice
-if ! ${PREFIX}/bin/datasid-wget.sh 192.168.0.253/api/datasid -O ${DATADIR}/telecentroInfo; then
+if ! ${PREFIX}/bin/datasid-wget.sh 192.168.0.253/api/datasid -O ${DATADIR}/telecentroInfo -t 1; then
     date +"%F %T - Error while downloading telecentroInfo."
 #	exit 5
 else
@@ -172,7 +172,7 @@ fi
 rm -f ${DATADIR}/telecentroInfo
 
 # Check if telecentroInfo is configured
-if test -e ${CONFDIR}/telecentroInfo; then
+if ! test -f ${CONFDIR}/telecentroInfo; then
 	date +"%F %T - telecentroInfo not found in ${CONFDIR}/telecentroInfo, waiting configuration."
 	exit 8
 fi

agent/gen-scripts/collected-data/telecentro-info.tree

@@ -23,7 +23,7 @@
 export PREFIX="$(readlink -f "$(dirname $0)/../../")"
 
 # run datasid-common.sh
-bash "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
+source "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
 
 if test -z "${PREFIX}"; then
     exit 2
@@ -53,7 +53,7 @@ do
     collect=$(echo ${COLLECTDATA[$index]} | awk -F'=' '{print $2}')
 	value=$(cat ${CONFDIR}/telecentroInfo | grep $collect | awk -F'=' '{print $2}')
     # Check if the data exists
-    ! test -z '${value}' || exit $(($index + 2))
     index=$(($index + 1))
+    test -z ${value} && exit $(($index + 2))
     printf "<$tagName>$value</$tagName>"
 done

agent/gen-scripts/collected-data/user-history.tree

@@ -23,7 +23,7 @@
 export PREFIX="$(readlink -f "$(dirname $0)/../../")"
 
 # run datasid-common.sh
-bash "$(readlink -f "$(dirname $0)/../..")/bin/datasid-common.sh" || exit 1
+source "$(readlink -f "$(dirname $0)/../..")/bin/datasid-common.sh" || exit 1
 
 if test -z "${PREFIX}"; then
     exit 2

agent/network-scripts/net-collected-data/telecentro-id.tree

@@ -23,7 +23,7 @@
 export PREFIX="$(readlink -f "$(dirname $0)/../../")"
 
 # run datasid-common.sh
-bash "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
+source "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
 
 if test -z "${PREFIX}"; then
     exit 2
@@ -33,4 +33,7 @@ fi
 test -f ${CONFDIR}/telecentroInfo || exit 3
 
 # Collect telecentro id
-grep "datasid" ${CONFDIR}/telecentroInfo | awk -F'=' '{print $2}'
+SUPERID=$(grep "superid" ${CONFDIR}/telecentroInfo | awk -F'=' '{print $2}') 
+test -z ${SUPERID} && exit 4
+
+echo $SUPERID