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

[svn at pcbsd.org]

Author: kris
Date: 2012-08-13 16:43:20 +0000 (Mon, 13 Aug 2012)
New Revision: 18428

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

Depreciate the PBI_PROXY* values in /usr/local/etc/pbi.conf.

Proxy settings for "fetch" should be set in /etc/profile now. 



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-13 16:41:26 UTC (rev 18427)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-08-13 16:43:20 UTC (rev 18428)
@@ -6788,43 +6788,6 @@
 		PBIDSLEEP="${_ckPBID}"
 	fi
 
-        # Load Proxy Variables
-	if [ -z "$PBI_PROXYURL" -a -e "${PBI_ETCCONF}" ] ; then
-		PBI_PROXYURL="`sed -n 's/PBI_PROXYURL: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYPORT="`sed -n 's/PBI_PROXYPORT: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYTYPE="`sed -n 's/PBI_PROXYTYPE: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYUSER="`sed -n 's/PBI_PROXYUSER: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYPASS="`sed -n 's/PBI_PROXYPASS: //p' ${PBI_ETCCONF}`"
-	fi
-
-	# 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/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
-
-
-        # Create the PROXY variables based upon proxy information supplied
-	if [ -n "$PBI_PROXYURL" ] ; then
-		if [ -n "$PBI_PROXYPORT" ] ; then
-			HTTP_PROXY="${PBI_PROXYURL}:${PBI_PROXYPORT}"
-			FTP_PROXY="${PBI_PROXYURL}:${PBI_PROXYPORT}"
-			export HTTP_PROXY FTP_PROXY
-		else
-			HTTP_PROXY="${PBI_PROXYURL}"
-			FTP_PROXY="${PBI_PROXYURL}"
-			export HTTP_PROXY FTP_PROXY
-		fi
-		if [ -n "$PBI_PROXYUSER" ] ; then
-			if [ -n "$PBI_PROXYPASS" ] ; then
-				HTTP_PROXY_AUTH="basic:*:${PBI_PROXYUSER}:${PBI_PROXYPASS}"
-				export HTTP_PROXY_AUTH
-			fi
-		fi
-	fi
 }
 
 # If the loaded file is a PBI PatchFile