To avoid condition self.no_proxy is already present

Author: p172913

scripts/insert_proxy_config.sh

@@ -31,27 +31,44 @@ else
   echo "'import os' already present; no changes made."
 fi
 
-# --- Step 2: Insert proxy & no_proxy environment code (idempotent) ---
+# --- Step 2: Insert proxy & no_proxy environment code ---
 if ! grep -q 'os.getenv("HTTPS_PROXY"' "$CONFIG_FILE"; then
-  LINE=$(grep -n "self.proxy = None" "$CONFIG_FILE" | cut -d: -f1)
-  if [ -n "$LINE" ]; then
-    INDENT=$(sed -n "${LINE}s/^\( *\).*/\1/p" "$CONFIG_FILE")
-
-    # Build the insertion block with correct indentation
-    
-    BLOCK+="${INDENT}# Load proxy from environment variables (if set)\n"
-    BLOCK+="${INDENT}if os.getenv(\"HTTPS_PROXY\"): self.proxy = os.getenv(\"HTTPS_PROXY\")\n"
-    BLOCK+="${INDENT}if os.getenv(\"https_proxy\"): self.proxy = os.getenv(\"https_proxy\")\n"
-    BLOCK+="${INDENT}if os.getenv(\"HTTP_PROXY\"): self.proxy = os.getenv(\"HTTP_PROXY\")\n"
-    BLOCK+="${INDENT}if os.getenv(\"http_proxy\"): self.proxy = os.getenv(\"http_proxy\")\n"
-    BLOCK+="${INDENT}self.no_proxy = None\n"
-    BLOCK+="${INDENT}# Load no_proxy from environment variables (if set)\n"
-    BLOCK+="${INDENT}if os.getenv(\"NO_PROXY\"): self.no_proxy = os.getenv(\"NO_PROXY\")\n"
-    BLOCK+="${INDENT}if os.getenv(\"no_proxy\"): self.no_proxy = os.getenv(\"no_proxy\")"
-
-    # Insert the block after the proxy default line
-    sed -i "${LINE}a $BLOCK" "$CONFIG_FILE"
-    echo "Proxy and no_proxy environment code inserted into $CONFIG_FILE."
+  PROXY_LINE=$(grep -n "self.proxy = None" "$CONFIG_FILE" | cut -d: -f1)
+  NO_PROXY_LINE=$(grep -n "^[[:space:]]*self\.no_proxy[[:space:]]*=[[:space:]]*None" "$CONFIG_FILE" | cut -d: -f1)
+
+  if [ -n "$PROXY_LINE" ]; then
+    INDENT=$(sed -n "${PROXY_LINE}s/^\( *\).*/\1/p" "$CONFIG_FILE")
+
+    BLOCK=""
+
+    if [ -z "$NO_PROXY_LINE" ]; then
+      # self.no_proxy = None is not present → insert full block after self.proxy = None
+      BLOCK+="${INDENT}# Load proxy from environment variables (if set)\n"
+      BLOCK+="${INDENT}if os.getenv(\"HTTPS_PROXY\"): self.proxy = os.getenv(\"HTTPS_PROXY\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"https_proxy\"): self.proxy = os.getenv(\"https_proxy\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"HTTP_PROXY\"): self.proxy = os.getenv(\"HTTP_PROXY\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"http_proxy\"): self.proxy = os.getenv(\"http_proxy\")\n"
+      BLOCK+="${INDENT}self.no_proxy = None\n"
+      BLOCK+="${INDENT}# Load no_proxy from environment variables (if set)\n"
+      BLOCK+="${INDENT}if os.getenv(\"NO_PROXY\"): self.no_proxy = os.getenv(\"NO_PROXY\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"no_proxy\"): self.no_proxy = os.getenv(\"no_proxy\")"
+
+      sed -i "${PROXY_LINE}a $BLOCK" "$CONFIG_FILE"
+      echo "Inserted full proxy + no_proxy block after 'self.proxy = None'."
+    else
+      # self.no_proxy = None exists → insert only env logic after that
+      BLOCK+="${INDENT}# Load proxy from environment variables (if set)\n"
+      BLOCK+="${INDENT}if os.getenv(\"HTTPS_PROXY\"): self.proxy = os.getenv(\"HTTPS_PROXY\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"https_proxy\"): self.proxy = os.getenv(\"https_proxy\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"HTTP_PROXY\"): self.proxy = os.getenv(\"HTTP_PROXY\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"http_proxy\"): self.proxy = os.getenv(\"http_proxy\")\n"
+      BLOCK+="${INDENT}# Load no_proxy from environment variables (if set)\n"
+      BLOCK+="${INDENT}if os.getenv(\"NO_PROXY\"): self.no_proxy = os.getenv(\"NO_PROXY\")\n"
+      BLOCK+="${INDENT}if os.getenv(\"no_proxy\"): self.no_proxy = os.getenv(\"no_proxy\")"
+
+      sed -i "${NO_PROXY_LINE}a $BLOCK" "$CONFIG_FILE"
+      echo "Inserted environment block after 'self.no_proxy = None'."
+    fi
   else
     echo "Warning: 'self.proxy = None' not found in $CONFIG_FILE. No proxy code inserted."
   fi