From 13a27cb5c53c138e5e34e429bfbf328ca2f34f07 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Oct 2021 20:30:36 +0800 Subject: [PATCH] update-10.29 --- aliyundrive-webdav/Makefile | 4 ++-- luci-app-aliyundrive-webdav/Makefile | 2 +- .../model/cbi/aliyundrive-webdav/client.lua | 17 +++++++++-------- .../po/zh-cn/aliyundrive-webdav.po | 2 +- .../luasrc/model/cbi/gpsysupgrade/api.lua | 4 ++-- my-default-settings/files/packages.init | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/aliyundrive-webdav/Makefile b/aliyundrive-webdav/Makefile index 679915bbd..155044132 100644 --- a/aliyundrive-webdav/Makefile +++ b/aliyundrive-webdav/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aliyundrive-webdav -PKG_VERSION:=0.5.0 -PKG_RELEASE:=1 +PKG_VERSION:=0.5.1 +PKG_RELEASE:=$(AUTORELESE) PKG_LICENSE:=MIT PKG_MAINTAINER:=messense diff --git a/luci-app-aliyundrive-webdav/Makefile b/luci-app-aliyundrive-webdav/Makefile index cac7d75d2..c008f0028 100644 --- a/luci-app-aliyundrive-webdav/Makefile +++ b/luci-app-aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-aliyundrive-webdav -PKG_VERSION:=0.5.0 +PKG_VERSION:=0.5.1 PKG_RELEASE:=1 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua b/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua index 0f470fb67..7cdbf8842 100644 --- a/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua +++ b/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua @@ -1,8 +1,9 @@ local uci = luci.model.uci.cursor() local m, e -m = Map("aliyundrive-webdav", translate("AliyunDrive WebDAV"), - translate("Project GitHub URL")) +m = Map("aliyundrive-webdav") +m.title = translate("AliyunDrive WebDAV") +m.description = translate("Project GitHub URL") m:section(SimpleSection).template = "aliyundrive-webdav/aliyundrive-webdav_status" @@ -12,11 +13,11 @@ e.anonymous = true enable = e:option(Flag, "enable", translate("Enable")) enable.rmempty = false -refresh_token = e:option(Value, "refresh_token", translate("Refresh Token"), - translate("How to get refresh token")) +refresh_token = e:option(Value, "refresh_token", translate("Refresh Token")) +refresh_token.description = translate("How to get refresh token") -root = e:option(Value, "root", translate("Root Directory"), - translate("Restrict access to a folder of aliyundrive, defaults to / which means no restrictions")) +root = e:option(Value, "root", translate("Root Directory")) +root.description = translate("Restrict access to a folder of aliyundrive, defaults to / which means no restrictions") root.default = "/" host = e:option(Value, "host", translate("Host")) @@ -46,8 +47,8 @@ cache_ttl.datatype = "uinteger" no_trash = e:option(Flag, "no_trash", translate("Delete file permanently instead of trashing")) no_trash.rmempty = false -domain_id = e:option(Value, "domain_id", translate("Domain ID"), - translate("Input domain_id option will use Aliyun PDS instead of AliyunDrive")) +domain_id = e:option(Value, "domain_id", translate("Domain ID")) +domain_id.description = translate("Input domain_id option will use Aliyun PDS instead of AliyunDrive") debug = e:option(Flag, "debug", translate("Debug Mode")) debug.rmempty = false diff --git a/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po b/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po index 4a200b106..09718aab1 100644 --- a/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po +++ b/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po @@ -71,4 +71,4 @@ msgid "Domain ID" msgstr "阿里云相册与云盘服务 domainId" msgid "Input domain_id option will use Aliyun PDS instead of AliyunDrive" -msgid "填写此选项将使用阿里云相册与网盘服务而不是阿里云盘" +msgstr "填写此选项将使用阿里云相册与网盘服务而不是阿里云盘" diff --git a/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua b/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua index 445c9f795..bd425799c 100644 --- a/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua +++ b/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua @@ -6,10 +6,10 @@ local util = require "luci.util" appname = "gpsysupgrade" curl = "/usr/bin/curl" -curl_args = {"-skfL", "--connect-timeout 3", "--retry 3", "-m 60"} +curl_args = {"-skfL", "--connect-timeout 3", "--retry 3"} wget = "/usr/bin/wget" wget_args = {"--no-check-certificate", "--quiet", "--timeout=100", "--tries=3"} -command_timeout = 300 +command_timeout = 40 LEDE_BOARD = nil DISTRIB_TARGET = nil diff --git a/my-default-settings/files/packages.init b/my-default-settings/files/packages.init index e9d0e1d21..853daf8d7 100644 --- a/my-default-settings/files/packages.init +++ b/my-default-settings/files/packages.init @@ -33,7 +33,7 @@ fi while :; do opkg update | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 if [ "$?" == "0" ]; then - def="$(opkg list-upgradable | cut -f 1 -d ' ' | grep -vE 'opkg|luci-lib-fs|firewall|base-files|luci-base|busybox|dnsmasq-full|coremark|miniupnpd|luci-mod-network|luci-mod-status|luci-mod-system')" + def="$(opkg list-upgradable | cut -f 1 -d ' ' | grep -vE 'opkg|luci-lib-fs|firewall|base-files|luci-base|busybox|nginx-|dnsmasq-full|coremark|miniupnpd|luci-mod-network|luci-mod-status|luci-mod-system')" if [ ! -f /etc/inited ]; then insed="$(cat $BKOPKG/user_installed.opkg)" fi