Skip to content

Commit

Permalink
1.7.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
frainzy1477 committed Jun 1, 2020
1 parent 2501c2e commit 4324902
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=luci-app-clash
PKG_VERSION:=1.7.1
PKG_VERSION:=1.7.1.1
PKG_MAINTAINER:=frainzy1477


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
A rule based custom proxy for Openwrt based on <a href="https://github.com/Dreamacro/clash" target="_blank">Clash</a>.
</p>
<p align="center">
<a target="_blank" href="https://github.com/frainzy1477/luci-app-clash/releases/tag/v1.7.1">
<img src="https://img.shields.io/badge/luci%20for%20clash-v1.7.1-blue.svg">
<a target="_blank" href="https://github.com/frainzy1477/luci-app-clash/releases/tag/v1.7.1.1">
<img src="https://img.shields.io/badge/luci%20for%20clash-v1.7.1.1-blue.svg">
</a>
<!-- <a href="https://github.com/frainzy1477/luci-app-clash/releases" target="_blank">
<img src="https://img.shields.io/github/downloads/frainzy1477/luci-app-clash/total.svg?style=flat-square"/>
Expand All @@ -22,8 +22,8 @@

- cd /tmp
- opkg update
- opkg install luci-app-clash_1.7.1_all.ipk
- opkg install luci-app-clash_1.7.1_all.ipk --force-depends
- opkg install luci-app-clash_1.7.1.1_all.ipk
- opkg install luci-app-clash_1.7.1.1_all.ipk --force-depends

## Features

Expand Down
2 changes: 1 addition & 1 deletion root/usr/share/clash/luci_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.1
1.7.1.1
14 changes: 9 additions & 5 deletions root/usr/share/clash/update_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [ $type == "clash" ] && [ ! -z $url ];then
echo "开始更新配置" >$REAL_LOG
fi
wget --no-check-certificate --user-agent="Clash/OpenWRT" $url -O 2>&1 >1 $CONFIG_YAML

sleep 3
if [ "$?" -eq "0" ]; then
if [ $lang == "en" ] || [ $lang == "auto" ];then
echo "Updating Configuration Completed" >$REAL_LOG
Expand All @@ -50,7 +50,7 @@ if [ $type == "ssr2clash" ] && [ ! -z $url ];then
echo "开始更新配置" >$REAL_LOG
fi
wget --no-check-certificate --user-agent="Clash/OpenWRT" "https://ssrsub2clashr.herokuapp.com/ssrsub2clash?sub=$url" -O 2>&1 >1 $CONFIG_YAML

sleep 3
if [ "$?" -eq "0" ]; then

CONFIG_YAMLL="/tmp/conf"
Expand Down Expand Up @@ -114,7 +114,7 @@ if [ $type == "v2clash" ] && [ ! -z $url ];then
echo "开始更新配置" >$REAL_LOG
fi
wget --no-check-certificate --user-agent="Clash/OpenWRT" "https://tgbot.lbyczf.com/v2rayn2clash?url=$url" -O 2>&1 >1 $CONFIG_YAML

sleep 3
if [ "$?" -eq "0" ]; then
if [ $lang == "en" ] || [ $lang == "auto" ];then
echo "Updating Configuration Completed" >$REAL_LOG
Expand All @@ -133,9 +133,13 @@ fi

count_nums=$(( $count_nums + 1))
done

sleep 2
if [ "$c_type" -eq 1 ];then

use=$(uci get clash.config.use_config 2>/dev/null)

if [ "$c_type" -eq 1 ] && [ "$(ls -l $use|awk '{print int($5)}')" -ne 0 ];then

if pidof clash >/dev/null; then
/etc/init.d/clash restart 2>/dev/null
fi
Expand Down

0 comments on commit 4324902

Please sign in to comment.