bugfix: P-Agent无法连接外网时，安装失败的问题 (fixed #354)

TencentBlueKing · Dec 16, 2021 · 3c3b79c · 3c3b79c
1 parent 4268dd0
commit 3c3b79c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/dev_log/2.1.360/xcwang_202112151826.yaml b/dev_log/2.1.360/xcwang_202112151826.yaml
@@ -0,0 +1,3 @@
+---
+bugfix:
+  - "P-Agent无法连接外网时，安装失败的问题 (fixed #354)"
diff --git a/script_tools/setup_pagent.py b/script_tools/setup_pagent.py
@@ -112,7 +112,7 @@ def arg_parser() -> argparse.ArgumentParser:
     parser.add_argument("-HSN", "--host-script-name", type=str, help="Host Script Name")
     parser.add_argument("-HS", "--host-shell", type=str, help="Host Shell")
     parser.add_argument("-CPA", "--channel-proxy-address", type=str, help="Channel Proxy Address", default=None)
-    parser.add_argument("-ADP", "--agent-download-proxy", type=str, help="Agent Download Proxy", default=True)
+    parser.add_argument("-ADP", "--agent-download-proxy", type=bool, help="Agent Download Proxy", default=True)
     return parser
 
 
@@ -377,9 +377,9 @@ def main() -> None:
             f"rm -f {tmp_dir}{script_name}",
         ]
         download_cmd = (
-            f"curl {args.download_url}/{script_name} -o {tmp_dir}{script_name} -sSf "
+            f"curl {args.download_url}/{script_name} -o {tmp_dir}{script_name} -sSf -x {http_proxy_url} "
             if args.agent_download_proxy
-            else f"curl {args.download_url}/{script_name} -o {tmp_dir}{script_name} -sSf -x {http_proxy_url} "
+            else f"curl {args.download_url}/{script_name} -o {tmp_dir}{script_name} -sSf "
         )
         cmd.append(download_cmd)
         cmd.append(
@@ -413,10 +413,10 @@ def main() -> None:
     else:
         cmd = [f"del /q /s /f {tmp_dir}{script_name} {tmp_dir}gsectl.bat"]
         download_cmd = (
-            f"{tmp_dir}curl.exe {args.download_url}/{script_name} -o {tmp_dir}{script_name} -sSf "
+            f"{tmp_dir}curl.exe {args.download_url}/{script_name}"
+            f" -o {tmp_dir}{script_name} -sSf -x {http_proxy_url} "
             if args.agent_download_proxy
-            else f"{tmp_dir}curl.exe {args.download_url}/{script_name}"
-            f"-o {tmp_dir}{script_name} -sSf -x {http_proxy_url} "
+            else f"{tmp_dir}curl.exe {args.download_url}/{script_name} -o {tmp_dir}{script_name} -sSf "
         )
         cmd.append(download_cmd)