Merge pull request #30 from BrightXiaoHan/29-socks5

update some pipx packages solve #29 #27
BrightXiaoHan · Sep 27, 2023 · 259c003 · 259c003
2 parents 5834e99 + a2abbbe
commit 259c003
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/general/fish/config.fish b/general/fish/config.fish
@@ -26,6 +26,13 @@ set -gx PATH node_modules/.bin $PATH
 # pyenv set MAKE_OPTS
 set -gx MAKE_OPTS "-j(nproc --ignore=1)"
 
+# proxy alias
+alias setproxy="set ALL_PROXY 'socks5://127.0.0.1:1080'"
+alias unsetproxy="set -e ALL_PROXY"
+alias ip="curl http://ip-api.com/json/?lang=zh-CN"
+alias sethttpproxy="set HTTPS_PROXY 'http://127.0.0.1:7890'"
+alias unsethttpproxy="set -e HTTPS_PROXY"
+
 switch (uname)
   case Darwin
     source (dirname (status --current-filename))/config-osx.fish

diff --git a/homecli/install.py b/homecli/install.py
@@ -235,11 +235,12 @@ def install_conda():
         check=True,
         env=env,
     )
-    for package in ["rich-cli", "shadowsocksr-cli"]:
+    for package in ["rich-cli", "git+https://github.com/BrightXiaoHan/ssr-command-client.git@socks2http", "mycli", "mdformat"]:
         subprocess.run(
             [
                 os.path.join(CACHE_DIR, "miniconda", "bin", "pipx"),
                 "install",
+                "--force",
                 package,
             ],
             check=True,