From 3cccfb530d993a9f2356ee1301f7cb46af6c9819 Mon Sep 17 00:00:00 2001
From: tke <tobias.kessels@certbw.de>
Date: Tue, 19 Nov 2019 14:49:58 +0100
Subject: [PATCH] moved proxy_config to seperate file

---
 proxy/get_proxy.sh           | 21 +++++++++++++++++++++
 proxy/update_bashrc_proxy.sh | 16 ++--------------
 proxy/update_docker_proxy.sh | 11 +++++++----
 3 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 proxy/get_proxy.sh

diff --git a/proxy/get_proxy.sh b/proxy/get_proxy.sh
new file mode 100644
index 0000000..eecf0ff
--- /dev/null
+++ b/proxy/get_proxy.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+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
+else
+  echo "Using >>${proxy_ip}<< as Proxy-Address"
+fi
+
+if [ -z "${proxy_port}" ]; then
+  echo -n "Proxy-Port: "
+  read proxy_port
+else
+  echo "Using >>${proxy_port}<< as Proxy-Port"
+fi
+
+echo "Using ${proxy_ip}:${proxy_port} as Proxy!"
+
diff --git a/proxy/update_bashrc_proxy.sh b/proxy/update_bashrc_proxy.sh
index 4a25fa1..d1485b7 100755
--- a/proxy/update_bashrc_proxy.sh
+++ b/proxy/update_bashrc_proxy.sh
@@ -1,18 +1,6 @@
 #!/bin/bash
-
-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!"
+path=$(dirname $(readlink -f "${0}"))
+. "${path}/get_proxy.sh"
 
 echo -n "Username: "
 read username
diff --git a/proxy/update_docker_proxy.sh b/proxy/update_docker_proxy.sh
index 4fa2904..c3cfebf 100755
--- a/proxy/update_docker_proxy.sh
+++ b/proxy/update_docker_proxy.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
-#proxy_ip="192.168.x.x"
-proxy_port="8080"
 
-echo -n "Proxy_IP: "
-read proxy_ip
+
+
+#populate proxy_ip and proxy_port variables
+path=$(dirname $(readlink -f "${0}"))
+. "${path}/get_proxy.sh"
+
+
 echo -n "Username: "
 read username
 echo -n "Password: "