From 207663f00623d3dcbedcd003ecdb2837c27009ad Mon Sep 17 00:00:00 2001
From: TKE <tobias.kessels@certbw.de>
Date: Tue, 12 Nov 2019 10:38:22 +0100
Subject: [PATCH] updated proxy-config-script for bash

script will now read current proxy from env
script will ask for proxyaddress
noproxy variable was moved to seperate file for individual configuration
scritp will no longer overwrite noproxy config
---
 proxy/update_bashrc_proxy.sh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/proxy/update_bashrc_proxy.sh b/proxy/update_bashrc_proxy.sh
index 550fa94..4a25fa1 100755
--- a/proxy/update_bashrc_proxy.sh
+++ b/proxy/update_bashrc_proxy.sh
@@ -1,6 +1,18 @@
 #!/bin/bash
-proxy_ip="192.168.x.x"
-proxy_port="8080"
+
+proxy_ip=$(env | grep http_proxy | grep -Pio '[^@/:]+(?=:\d+/?$)')
+proxy_port=$(env | grep http_proxy | grep -Pio '(?<=:)(\d+)(?=/?$)')
+
+if [ -z "${proxy_ip}" ]; then
+  echo "Enter Proxy IP or Hostname (no port): "
+  read proxy_ip
+fi
+if [ -z "${proxy_ip}" ]; then
+  echo -n "Proxy-Port: "
+  read proxy_port
+fi
+
+echo "Using ${proxy_ip}:${proxy_port} as Proxy!"
 
 echo -n "Username: "
 read username
@@ -9,15 +21,17 @@ read -s password
 user=$(logname)
 bashrc_file=/home/${user}/.bashrc
 proxy_file=/home/${user}/.http_proxy
+noproxy_file=/home/${user}/.http_noproxy
 
 encpassword=$(echo -n ${password}  | xxd -p | sed -e 's/\(..\)/%\1/g' )
 
 if ! grep -qF -e "PROXY_A93JK2" "${bashrc_file}" ; then
   echo "[ -f ${proxy_file} ] && . ${proxy_file} #PROXY_A93JK2" >> "${bashrc_file}"
+  echo "[ -f ${noproxy_file} ] && . ${noproxy_file} #PROXY_A93JK2" >> "${bashrc_file}"
 fi
 
 echo 'export "HTTP_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/"  > "${proxy_file}"
 echo 'export "HTTPS_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/"  >> "${proxy_file}"
 echo 'export "http_proxy=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/"  >> "${proxy_file}"
 echo 'export "https_proxy=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/"  >> "${proxy_file}"
-echo 'export "NO_PROXY=localhost,127.0.0.1"' >> "${proxy_file}"
+[ -f "${noproxy_file}" ] || echo 'export "NO_PROXY=localhost,127.0.0.1"' > "${noproxy_file}"