Proxy information prefix necessary for the client is now in run-config.sh

Moved from getProxyConf() to run-config.sh the piece of code which adds a
specific prefix (e.g. "--phost") to each proxy information variable, so they
can be used as parameters by the client binary.

This was causing an error in tryWget(), because it uses getProxyConf() to
obtain the proxy configuration to be able to download the update package.

Signed-off-by: Erik Alexandre Pucci <eap08@c3sl.ufpr.br>
Signed-off-by: Danilo K. S. Yorinori <danilok@c3sl.ufpr.br>

common.sh

@@ -38,12 +38,6 @@ function getProxyConf()
     puid=$(grep "^puid=" ${PROXYCONF} 2> /dev/null | cut -f2 -d=)
     ppasswd=$(grep "^ppasswd=" ${PROXYCONF} 2> /dev/null | cut -f2 -d=)
 
-    # Add a prefix to each non empty proxy information
-    test -n "${phost}" && phost="--phost=${phost}"
-    test -n "${pport}" && pport="--pport=${pport}"
-    test -n "${puid}" && puid="--puid=${puid}"
-    test -n "${ppasswd}" && ppasswd="--ppasswd=${ppasswd}"
-
     # If there is any proxy information, add a message to log
     if test -n "${phost}${pport}${puid}${ppasswd}"; then
         printf "Proxy configuration being used.\n" >> ${log}

run-config.sh

@@ -66,6 +66,11 @@ if test ! -f "${dirname}/conf/inep" -o -z "${inep}"; then
 fi
 
 getProxyConf
+# Add a prefix to each non empty proxy information
+test -n "${phost}" && phost="--phost=${phost}"
+test -n "${pport}" && pport="--pport=${pport}"
+test -n "${puid}" && puid="--puid=${puid}"
+test -n "${ppasswd}" && ppasswd="--ppasswd=${ppasswd}"
 proxy="${phost} ${pport} ${puid} ${ppasswd}"
 
 inep="--inep=${inep}"