Merge branch 'master' of ssh://apo.geoffray-levasseur.org/share/services/git/legos

2021-09-15 16:58:08 +02:00
parent 9a76d23991 fba62f4941
commit 33cd70f2f5
5 changed files with 75 additions and 4 deletions
--- a/init.sh
+++ b/init.sh
@@ -108,7 +108,7 @@ load_configuration
 process_commandline_and_vars

 # Declare proxy system vars if needed and if not already declared
-if [[ -n $PROXYSRV && -n $PROXYSRVPORT ]]; then
+if [[ -n $PROXYSRV && -n $PROXYSRVPORT && -z $NO_PROXY ]]; then
    export http_proxy=${http_proxy:-"http://$PROXYSRV:$PROXYSRVPORT/"}
    export https_proxy=${https_proxy:-"http://$PROXYSRV:$PROXYSRVPORT/"}
 fi