introduced a new parameter CURL_OPTIONS; removed unnecessary re-setting of http_proxy

1 files changed, 4 insertions, 9 deletions

diff --git a/prepare-videochat.sh b/prepare-videochat.sh
index b5d4847..8a36a23 100755
--- a/prepare-videochat.sh
+++ b/prepare-videochat.sh
@@ -245,11 +245,12 @@ url_reachable() {
         # has it in its core, so we don't need to check that case)
         sudo apt-get install -y curl
     fi
+
+    CURL_OPTIONS=""
     if [ $DISABLE_PROXY = 1 ]; then
-        curl --noproxy '*' -m 5 -sI "$1" >/dev/null
-    else
-        curl -m 5 -sI "$1" >/dev/null
+        CURL_OPTIONS="--noproxy $WIFI_IP"
     fi
+    curl $CURL_OPTIONS -m 5 -sI "$1" >/dev/null
 }
 
 send_intent() {
@@ -536,7 +537,6 @@ fi
 
 if [ $DISABLE_PROXY = 1 ]; then
     # Disabling proxy to access WIFI_IP viz. on local network
-    temp_http_proxy=$http_proxy
     unset http_proxy
 fi
 
@@ -567,10 +567,5 @@ pactl set-default-source ${DEFAULT_SOURCE}
 pactl unload-module ${ECANCEL_ID}
 pactl unload-module ${SINK_ID}
 
-if [ $DISABLE_PROXY = 1 ]; then
-    # Renabling proxy on completion of the script
-    export http_proxy=$temp_http_proxy
-fi
-
 echo "Disconnected from IP Webcam. Have a nice day!"
 # idea: capture ctrl-c signal and set default source back