From: root Date: Tue, 17 Dec 2019 11:31:53 +0000 (+0100) Subject: .bashrc: Move *_proxy earlier; I do not remember why. X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=d1d2c6c54abe935ff63d58a68835049547af425b;ds=sidebyside .bashrc: Move *_proxy earlier; I do not remember why. --- diff --git a/.bashrc b/.bashrc index b102708..50b8eac 100644 --- a/.bashrc +++ b/.bashrc @@ -9,6 +9,14 @@ fi export PERL5LIB="$HOME/perl5/lib/perl5/`uname -m`-linux-thread-multi:$HOME/perl5/lib/perl5"; +if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp \ +|| grep 2>/dev/null -q '^....: 00000000000000000000000000000000:0C38 00000000000000000000000000000000:0000 0A ' /proc/net/tcp6 \ +;then + export http_proxy=http://127.0.0.1:3128/ + export https_proxy=http://127.0.0.1:3128/ + export ftp_proxy=http://127.0.0.1:3128/ +fi + # "$PS1" for interactive shells detection. if [ -n "$PS1" -a -z "$_home_short_dotbashrc" ];then # We permit later reinitialization by unsetting it. @@ -217,13 +225,6 @@ unset cpus # as Sun workaround as Debian misses: /etc/termcap # expects: $uname_p [ "$TERM" = vt220 -a "${uname_p%86}" != "$uname_p" ] && export TERM=linux -if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp \ -|| grep 2>/dev/null -q '^....: 00000000000000000000000000000000:0C38 00000000000000000000000000000000:0000 0A ' /proc/net/tcp6 \ -;then - export http_proxy=http://127.0.0.1:3128/ - export https_proxy=http://127.0.0.1:3128/ - export ftp_proxy=http://127.0.0.1:3128/ -fi _selfabs= [ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_SOURCE" [ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$PWD/.bashrc"