fix the bug of open pac proxy in Ubuntu desktop and change the defaul…

…t http port to 10000.
TyrantLucifer · Dec 15, 2021 · 9b2b735 · 9b2b735
1 parent 155cbfa
commit 9b2b735
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/shadowsocksr_cli/functions.py b/shadowsocksr_cli/functions.py
@@ -225,12 +225,15 @@ def open_global_proxy(local_port, http_port=80):
     @staticmethod
     @is_ubuntu
     def open_pac_proxy(local_port, http_port=80):
-        HandleHttpServer.handle_http_server("start", local_port, http_port)
-
         cmd = "gsettings set org.gnome.system.proxy autoconfig-url http://{0}:{1}/autoproxy.pac". \
             format(Setting.get_value('local_address'), http_port)
         os.system(cmd)
+        cmd = "gsettings set org.gnome.system.proxy mode 'auto'"
+        os.system(cmd)
         logger.info('Open pac proxy - {0}:{1}'.format(Setting.get_value('local_address'), local_port))
+        HandleHttpServer.handle_http_server("start", local_port, http_port)
+
+
 
     @staticmethod
     @is_ubuntu

diff --git a/shadowsocksr_cli/main.py b/shadowsocksr_cli/main.py
@@ -38,7 +38,7 @@ def get_parser():
     parser.add_argument("--test-again", metavar="ssr_node_id", type=int, help="test ssr node again")
     parser.add_argument("--print-qrcode", metavar="ssr_node_id", type=int, help="print ssr node qrcode")
     parser.add_argument("--http", metavar="action[start stop status]", help="Manager local http server")
-    parser.add_argument("--http-port", metavar="http server port", default=80, type=int,
+    parser.add_argument("--http-port", metavar="http server port", default=10000, type=int,
                         help="assign local http server port")
     parser.add_argument("--setting-global-proxy", action="store_true",
                         help="setting system global proxy,only support on " + color.red('Ubuntu Desktop'))