From 2f0edadbe78c6af3656c361931582dba186f4dbd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 16:22:16 +0800 Subject: [PATCH] update 2023-06-09 16:22:16 --- adguardhome/Makefile | 4 ++-- luci-app-serverchan/root/etc/uci-defaults/luci-wechatpush | 6 ++++++ luci-app-serverchan/root/usr/share/wechatpush/wechatpush | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/adguardhome/Makefile b/adguardhome/Makefile index b07b39557..0caab5ba6 100644 --- a/adguardhome/Makefile +++ b/adguardhome/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.30 +PKG_VERSION:=0.107.31 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=a05c3c796ff6c2377eb4288105c7821f9ad04d4b47137c6fe69dfb59f3b6a0b9 +PKG_MIRROR_HASH:=38e2ad4ffd8b91bcc6ce9d8fcfcf4d9b9b7667fe9c4f535980eb3c8a8076c903 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt diff --git a/luci-app-serverchan/root/etc/uci-defaults/luci-wechatpush b/luci-app-serverchan/root/etc/uci-defaults/luci-wechatpush index 99537c719..8e29cc58d 100755 --- a/luci-app-serverchan/root/etc/uci-defaults/luci-wechatpush +++ b/luci-app-serverchan/root/etc/uci-defaults/luci-wechatpush @@ -170,4 +170,10 @@ serverchan_to_wechatpush_get \ uci commit wechatpush rm -rf "$serverchan_config" 2>/dev/null +dir="/tmp/wechatpush/" && mkdir -p ${dir} +echo "" > ${dir}web_login +echo "" > ${dir}ssh_login +echo "" > ${dir}web_failed +echo "" > ${dir}ssh_failed + nohup sh -c 'while [ -f /var/lock/opkg.lock ]; do sleep 1; done; opkg remove luci-app-serverchan; rm -rf /tmp/luci-*' >/dev/null 2>&1 & diff --git a/luci-app-serverchan/root/usr/share/wechatpush/wechatpush b/luci-app-serverchan/root/usr/share/wechatpush/wechatpush index be2af6bc0..9bd502f28 100755 --- a/luci-app-serverchan/root/usr/share/wechatpush/wechatpush +++ b/luci-app-serverchan/root/usr/share/wechatpush/wechatpush @@ -1462,10 +1462,10 @@ function send(){ # 初始化 if [ "$1" ] ;then [ $1 == "soc" ] && get_config "soc_code" "server_host" "server_port" - [ $1 == "soc" ] && soc_temp && return $? + [ $1 == "soc" ] && soc_temp && exit $? read_config - [ $1 == "send" ] && send && return $? - [ $1 == "test" ] && send test && return $? + [ $1 == "send" ] && send && exit $? + [ $1 == "test" ] && send test && exit $? [ $1 == "t1" ] && thread_num=1 || exit else read_config