From 26128cc548e512fd2a511ee42686d61b60499b9d Mon Sep 17 00:00:00 2001
From: Erik Alexandre Pucci <eap08@c3sl.ufpr.br>
Date: Sun, 17 Apr 2011 20:24:41 -0300
Subject: [PATCH] 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 | 6 ------
run-config.sh | 5 +++++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/common.sh b/common.sh
index 5883c62..571f01a 100644
--- a/common.sh
+++ b/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}
diff --git a/run-config.sh b/run-config.sh
index 3867a25..5613960 100755
--- a/run-config.sh
+++ b/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}"
--
GitLab