From fc80994cc5324185ead9ec86fe9800ff3a190c0f Mon Sep 17 00:00:00 2001 From: juewuy Date: Tue, 22 Jun 2021 23:09:50 +0800 Subject: [PATCH] =?UTF-8?q?v1.4.0-pre-release=20~=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8ax18=E7=AD=89=E4=BD=8E=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=86=85=E6=A0=B8=E8=AE=BE=E5=A4=87=20~=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9C=AC=E6=9C=BADocker=E4=BB=A3=E7=90=86(?= =?UTF-8?q?=E9=9C=80docker=E7=BD=91=E5=8D=A1=E8=AE=BE=E7=BD=AE=E4=B8=BAbri?= =?UTF-8?q?dge=E6=A8=A1=E5=BC=8F)=20~=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=85=AC=E7=BD=91=E8=AE=BF=E9=97=AEDashboard=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=8F=8A=E6=B7=B7=E5=90=88=E4=BB=A3=E7=90=86=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20~=E5=A2=9E=E5=8A=A0clash=20-u=E5=8D=B8?= =?UTF-8?q?=E8=BD=BD=E5=91=BD=E4=BB=A4=20~=E4=BC=98=E5=8C=96=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=9C=BA=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=87=BA?= =?UTF-8?q?=E9=94=99bug=20~=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=8F=8A=E5=AE=89=E8=A3=85=E8=AF=B4=E6=98=8E=20~?= =?UTF-8?q?=E5=B1=80=E5=9F=9F=E7=BD=91=E8=BF=87=E6=BB=A4=E9=BB=91=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96=20~?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20~=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=AF=86DNS?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?bug=20~=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E9=83=A8=E5=88=86bug=20~=E7=89=88=E6=9C=AC=E5=8F=8A?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=BA=90=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0HTTP=E4=B8=93=E5=B1=9E=E6=BA=90?= =?UTF-8?q?=EF=BC=88=E6=84=9F=E8=B0=A2=E9=85=B1=E7=B4=AB=E8=A1=A8=E5=90=8C?= =?UTF-8?q?=E5=AD=A6=E6=8F=90=E4=BE=9B=E6=9C=8D=E5=8A=A1=E5=99=A8=EF=BC=81?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- README_CN.md | 33 ++++++++------------------------- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 255074c..7b137a8 100644 --- a/README.md +++ b/README.md @@ -38,16 +38,16 @@ opkg update && opkg install curl ```Shell #By github -export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c "$(curl -kfsSl $url/install_n.sh)" && source /etc/profile &> /dev/null +export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null #By jsdelivrCDN -export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install_n.sh)" && source /etc/profile &> /dev/null +export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null ``` ##### ~Use wget：
```sh #By jsdelivrCDN -export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install_n.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null +export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null ``` ~**Use a low version of wget (prompt not to support https) local installation**:
First clone the project to the local under the window (or [click to download the project source code zip package](https://github.com/juewuy/ShellClash/archive/refs/heads/master.zip) to the local and decompress it) @@ -59,7 +59,7 @@ sh git clone https://github.com/juewuy/ShellClash.git Then open /project address/ShellClash/bin/hfs/hfs.exe Click menu-add directory from disk-{find the directory where ShellClash source code is located}-add as real directory Click on the menu-IP address-{choose the actual IP address of your LAN} Click ShellClash-click to copy to clipboard Then use the following command to install in SSH ```sh -sh export url='Paste the copied address here' && wget -q -O /tmp/install.sh $url/install_n.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null +sh export url='Paste the copied address here' && wget -q -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null ``` Later, when updating the version, you need to update the local version library and open the hfs service, and then update in the SSH menu, and then you can build a local server through hfs to realize the function of uploading and updating the yaml configuration file diff --git a/README_CN.md b/README_CN.md index 3382024..d77b2c4 100644 --- a/README_CN.md +++ b/README_CN.md @@ -36,10 +36,10 @@ -- ~确认路由器设备已经开启SSH并获取root权限（带GUI桌面的Linux设备可使用自带终端安装）
~使用SSH连接工具（如putty，JuiceSSH，系统自带终端等）路由器或Linux设备的SSH管理界面或终端界面，并切换到root用户
-~确认设备已经安装curl或者wget下载工具。如未安装，LInux设备请[参考此处](https://www.howtoing.com/install-curl-in-linux)安装curl，基于OpenWrt（小米官方系统、潘多拉、高恪等）的设备请使用如下命令安装curl：
+~确认设备已经安装curl或者wget下载工具。**如未安装**，LInux设备请[参考此处](https://www.howtoing.com/install-curl-in-linux)安装curl，基于OpenWrt（小米官方系统、潘多拉、高恪等）的设备请使用如下命令安装curl：
```shell -opkg update && opkg install curl +opkg update && opkg install curl #如已安装请忽略 ``` ~之后在SSH界面执行如下安装命令，并按照后续提示完成安装
@@ -48,42 +48,25 @@ opkg update && opkg install curl ```Shell #github直连 -export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c "$(curl -kfsSl $url/install_n.sh)" && source /etc/profile &> /dev/null +export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null #jsdelivrCDN源 -export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install_n.sh)" && source /etc/profile &> /dev/null +export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null ``` ~**使用wget安装**：
```sh #Release版本-jsdelivrCDN源 -export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install_n.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null +export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null ``` -~**使用低版本wget（提示不支持https）本地安装**：
- -首先在window下将项目克隆到本地（或[点击下载项目源码zip包](https://github.com/juewuy/ShellClash/archive/refs/heads/master.zip)到本地后解压） +~**使用低版本wget（提示不支持https）安装**：
```sh -git clone https://github.com/juewuy/ShellClash.git +#Test版本-酱紫表私人http源 +export url='http://sc.qust.me/' && wget -q -O /tmp/install.sh $url/install_n.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null ``` -之后打开/项目地址/ShellClash/bin/hfs/hfs.exe - -点击菜单-从磁盘添加目录-{找到ShellClash源码所在目录}-添加为真实目录 - -点击菜单-IP地址-{选择你局域网的实际IP地址} - -点击ShellClash-点击复制到剪切板 - -之后在SSH中使用如下命令安装 - -```sh -export url='将复制的地址粘贴在这里' && wget -q -O /tmp/install.sh $url/install_n.sh && sh /tmp/install.sh && source /etc/profile &> /dev/null -``` - -之后更新版本时需要先更新本地版本库并打开hfs服务，再在SSH菜单内进行更新，之后也可以通过hfs搭建本地服务器来实现上传更新yaml配置文件的功能 - ~**非root用户安装后**请额外执行以下命令以读取环境变量：
```shell