[PC-BSD Commits] r15472 - pcbsd/current/src-sh/pbi-manager

[svn at pcbsd.org]

Author: kris
Date: 2012-02-17 18:29:54 +0000 (Fri, 17 Feb 2012)
New Revision: 15472

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Fix parsing PROXY values for pbi_add / fetch operations



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-02-17 18:17:24 UTC (rev 15471)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-02-17 18:29:54 UTC (rev 15472)
@@ -6533,11 +6533,11 @@
 
 	# If empty proxy config, check if configured for master pcbsd.conf file
 	if [ -z "$PBI_PROXYURL" -a -e "${PCBSD_ETCCONF}" ] ; then
-		PBI_PROXYURL="`sed -n 's/PBI_PROXYURL: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYPORT="`sed -n 's/PBI_PROXYPORT: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYTYPE="`sed -n 's/PBI_PROXYTYPE: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYUSER="`sed -n 's/PBI_PROXYUSER: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYPASS="`sed -n 's/PBI_PROXYPASS: //p' ${PCBSD_ETCCONF}`"
+		PBI_PROXYURL="`sed -n 's/PCBSD_PROXYURL: //p' ${PCBSD_ETCCONF}`"
+		PBI_PROXYPORT="`sed -n 's/PCBSD_PROXYPORT: //p' ${PCBSD_ETCCONF}`"
+		PBI_PROXYTYPE="`sed -n 's/PCBSD_PROXYTYPE: //p' ${PCBSD_ETCCONF}`"
+		PBI_PROXYUSER="`sed -n 's/PCBSD_PROXYUSER: //p' ${PCBSD_ETCCONF}`"
+		PBI_PROXYPASS="`sed -n 's/PCBSD_PROXYPASS: //p' ${PCBSD_ETCCONF}`"
 	fi
 
 
@@ -6545,10 +6545,12 @@
 	if [ -n "$PBI_PROXYURL" ] ; then
 		if [ -n "$PBI_PROXYPORT" ] ; then
 			HTTP_PROXY="${PBI_PROXYURL}:${PBI_PROXYPORT}"
-			export HTTP_PROXY
+			FTP_PROXY="${PBI_PROXYURL}:${PBI_PROXYPORT}"
+			export HTTP_PROXY FTP_PROXY
 		else
 			HTTP_PROXY="${PBI_PROXYURL}"
-			export HTTP_PROXY
+			FTP_PROXY="${PBI_PROXYURL}"
+			export HTTP_PROXY FTP_PROXY
 		fi
 		if [ -n "$PBI_PROXYUSER" ] ; then
 			if [ -n "$PBI_PROXYPASS" ] ; then