github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(脚本): 移除stable、修改时间计算方法

pull/534/merge
mack-a 2021-09-06 11:53:02 +08:00
parent 54c00dd57a
commit e4eb30df53
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -129,11 +129,6 @@
wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod 700 /root/install.sh && /root/install.sh wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod 700 /root/install.sh && /root/install.sh
``` ```
- Stable-v2.4.16【无gRPC】
```
wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/stable_v2.4.16/install.sh" && chmod 700 /root/install.sh && /root/install.sh
```
# 示例图 # 示例图
<img src="https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/install/install.jpg" width=700> <img src="https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/install/install.jpg" width=700>

18
install.sh
View File

@ -1005,9 +1005,10 @@ renewalTLS() {
modifyTime=$(date +%s -d "${modifyTime}") modifyTime=$(date +%s -d "${modifyTime}")
currentTime=$(date +%s) currentTime=$(date +%s)
stampDiff=$(("${currentTime}" - "${modifyTime}")) ((stampDiff=currentTime - modifyTime))
days=$(("${stampDiff}" / 86400)) ((days=stampDiff / 86400))
remainingDays=$((90 - "${days}")) ((remainingDays=90 - days))
tlsStatus=${remainingDays} tlsStatus=${remainingDays}
if [[ ${remainingDays} -le 0 ]]; then if [[ ${remainingDays} -le 0 ]]; then
tlsStatus="已过期" tlsStatus="已过期"
@ -1041,9 +1042,10 @@ checkTLStatus() {
modifyTime=$(date +%s -d "${modifyTime}") modifyTime=$(date +%s -d "${modifyTime}")
currentTime=$(date +%s) currentTime=$(date +%s)
stampDiff=$(("${currentTime}" - "${modifyTime}")) ((stampDiff=currentTime - modifyTime))
days=$(("${stampDiff}" / 86400)) ((days=stampDiff / 86400))
remainingDays=$((90 - "${days}")) ((remainingDays=90 - days))
tlsStatus=${remainingDays} tlsStatus=${remainingDays}
if [[ ${remainingDays} -le 0 ]]; then if [[ ${remainingDays} -le 0 ]]; then
tlsStatus="已过期" tlsStatus="已过期"
@ -4099,7 +4101,7 @@ subscribe() {
showAccounts >/dev/null showAccounts >/dev/null
mv /etc/v2ray-agent/subscribe_tmp/* /etc/v2ray-agent/subscribe/ mv /etc/v2ray-agent/subscribe_tmp/* /etc/v2ray-agent/subscribe/
if [[ -n $(ls /etc/v2ray-agent/subscribe) ]]; then if [[ -n $(ls /etc/v2ray-agent/subscribe/) ]]; then
find /etc/v2ray-agent/subscribe | while read -r email; do find /etc/v2ray-agent/subscribe | while read -r email; do
email=$(echo "${email}" | awk -F "[s][u][b][s][c][r][i][b][e][/]" '{print $2}') email=$(echo "${email}" | awk -F "[s][u][b][s][c][r][i][b][e][/]" '{print $2}')
local base64Result local base64Result
@ -4123,7 +4125,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者：mack-a" echoContent green "作者：mack-a"
echoContent green "当前版本：v2.5.30" echoContent green "当前版本：v2.5.31"
echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：八合一共存脚本\c" echoContent green "描述：八合一共存脚本\c"
showInstallStatus showInstallStatus