modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Intégration de la branche release-2.1.1

This commit is contained in:
Jephté Clain 2015-06-22 11:37:49 +04:00
parent 79df3907b6 71aa715657
commit 02742deccc
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.txt
View File

@ -1,3 +1,8 @@
## Version 2.1.1 du 22/06/2015-11:37
40225b0 Intégration de la branche proxy-default
2fa0791 profile.d/proxy lit aussi les valeurs par défaut pour l'hôte
## Version 2.1.0 du 22/06/2015-10:25 ## Version 2.1.0 du 22/06/2015-10:25
2a3eb76 Intégration de la branche uenv-modifs 2a3eb76 Intégration de la branche uenv-modifs

2
VERSION.txt
View File

@ -1 +1 @@
2.1.0 2.1.1

13
lib/profile.d/proxy.shared
View File

@ -11,9 +11,16 @@ function set_proxy() {
local FTP_PROXY_HOST FTP_PROXY_PORT local FTP_PROXY_HOST FTP_PROXY_PORT
local PROXY_LOCAL_DOMAINS AUTHFTP_PROXY_HOST local PROXY_LOCAL_DOMAINS AUTHFTP_PROXY_HOST
[ -f "$HOME/etc/default/proxy" ] && source "$HOME/etc/default/proxy" local default_profile
if [ -f "$HOME/etc/default.${HOSTNAME%%.*}/proxy" ]; then
default_profile="$HOME/etc/default.${HOSTNAME%%.*}/proxy"
elif [ -f "$HOME/etc/default/proxy" ]; then
default_profile="$HOME/etc/default/proxy"
fi
[ -f "$default_profile" ] && source "$default_profile"
if [ -n "$PROXY_ENABLE_LIBPROXY" -a -x /usr/bin/proxy ]; then if [ -n "$PROXY_ENABLE_LIBPROXY" -a -x /usr/bin/proxy ]; then
local -a proxies=($(proxy <<<http://www.google.fr/ 2>/dev/null)) local -a proxies=($(/usr/bin/proxy <<<http://www.google.fr/ 2>/dev/null))
proxy="${proxies[0]}" proxy="${proxies[0]}"
if [ "$proxy" == "direct://" ]; then if [ "$proxy" == "direct://" ]; then
# pas de proxy # pas de proxy
@ -29,7 +36,7 @@ function set_proxy() {
return return
fi fi
unset no_proxy unset no_proxy
elif [ -f "$HOME/etc/default/proxy" ]; then elif [ -f "$default_profile" ]; then
# proxy par défaut # proxy par défaut
if [ -n "$HTTP_PROXY_HOST" ]; then if [ -n "$HTTP_PROXY_HOST" ]; then
proxy="http://$HTTP_PROXY_HOST:${HTTP_PROXY_PORT:-3128}/" proxy="http://$HTTP_PROXY_HOST:${HTTP_PROXY_PORT:-3128}/"