update-02.13

This commit is contained in:
github-actions[bot]
2022-02-13 20:28:05 +08:00
parent 5a946f8ebf
commit e58ea69468
8 changed files with 42 additions and 34 deletions

View File

@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=aliyundrive-webdav PKG_NAME:=aliyundrive-webdav
PKG_VERSION:=1.2.3 PKG_VERSION:=1.2.4
PKG_RELEASE:=$(AUTORELESE) PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_MAINTAINER:=messense <messense@icloud.com> PKG_MAINTAINER:=messense <messense@icloud.com>
@@ -29,14 +29,14 @@ PKG_HASH:=skip
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/aliyundrive-webdav define Package/aliyundrive-webdav
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=Multimedia CATEGORY:=Multimedia
TITLE:=WebDAV server for AliyunDrive TITLE:=WebDAV server for AliyunDrive
URL:=https://github.com/messense/aliyundrive-webdav URL:=https://github.com/messense/aliyundrive-webdav
endef endef
define Package/aliyundrive-webdav/description define Package/aliyundrive-webdav/description
WebDAV server for AliyunDrive. WebDAV server for AliyunDrive.
endef endef
define Package/aliyundrive-webdav/conffiles define Package/aliyundrive-webdav/conffiles

View File

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=chinadns-ng PKG_NAME:=chinadns-ng
PKG_VERSION:=1.0-beta.25 PKG_VERSION:=1.0-beta.25
PKG_RELEASE:=$(AUTORELESE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git

View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-aliyundrive-webdav PKG_NAME:=luci-app-aliyundrive-webdav
PKG_VERSION:=1.2.3 PKG_VERSION:=1.2.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)

View File

@@ -53,7 +53,6 @@ reload_service() {
} }
setcron() { setcron() {
chmod 755 /etc/mosdns/mosupdater.sh
[ "$(tail -n1 /etc/crontabs/root | wc -l)" -eq 0 ] && [ -n "$(cat /etc/crontabs/root 2>/dev/null)" ] && echo >>/etc/crontabs/root [ "$(tail -n1 /etc/crontabs/root | wc -l)" -eq 0 ] && [ -n "$(cat /etc/crontabs/root 2>/dev/null)" ] && echo >>/etc/crontabs/root
grep -q "mosupdater.sh" "$CRON_FILE" && { grep -q "mosupdater.sh" "$CRON_FILE" && {
[ "$(uci -q get mosdns.mosdns.geo_auto_update)" -eq 1 ] && echo "0 $(uci -q get mosdns.mosdns.geo_update_day_time) * * $(uci -q get mosdns.mosdns.geo_update_week_time) /etc/mosdns/mosupdater.sh" >>$CRON_FILE [ "$(uci -q get mosdns.mosdns.geo_auto_update)" -eq 1 ] && echo "0 $(uci -q get mosdns.mosdns.geo_update_day_time) * * $(uci -q get mosdns.mosdns.geo_update_week_time) /etc/mosdns/mosupdater.sh" >>$CRON_FILE

View File

@@ -2,7 +2,7 @@
source /etc/mosdns/library.sh source /etc/mosdns/library.sh
if [ "$(ifconfig | grep -c wan)" = 0 ]; then if [ "$(ifconfig | grep -c wan)" = 0 ]; then
echo "119.29.29.29" bakdns "$1"
exit 0 exit 0
fi fi
@@ -11,5 +11,5 @@ if [[ "$(getdns 0)" =~ ^127\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
elif [[ "$(getdns "$1")" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then elif [[ "$(getdns "$1")" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
getdns "$1" getdns "$1"
else else
echo "119.29.29.29" bakdns "$1"
fi fi

View File

@@ -1,28 +1,37 @@
#!/bin/echo Warning:this is a library should be sourced! #!/bin/echo Warning:this is a library should be sourced!
pid() { bakdns() {
pgrep -f "$1" if [ "$1" == "0" ]; then
} echo "119.29.29.29"
elif [ "$1" == "1" ]; then
getdat() { echo "101.226.4.6"
if exist curl; then
curl -fSLo "$TMPDIR/$1" "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1"
else
wget "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1" -nv -O "$TMPDIR/$1"
fi
}
getdns() {
if [ "$2" == "inactive" ]; then
ubus call network.interface.wan status | jsonfilter -e "@['inactive']['dns-server'][$1]"
else
ubus call network.interface.wan status | jsonfilter -e "@['dns-server'][$1]"
fi fi
} }
exist() { exist() {
command -v "$1" >/dev/null &>/dev/null command -v "$1" >/dev/null &>/dev/null
} }
getdat() {
if exist curl; then
curl -fSLo "$TMPDIR/$1" "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1"
else
wget "https://gh.404delivr.workers.dev/https://github.com/QiuSimons/openwrt-mos/raw/master/luci-app-mosdns/root/etc/mosdns/$1" -nv -O "$TMPDIR/$1"
fi
}
getdns() {
if [ "$2" == "inactive" ]; then
ubus call network.interface.wan status | jsonfilter -e "@['inactive']['dns-server'][$1]"
else
ubus call network.interface.wan status | jsonfilter -e "@['dns-server'][$1]"
fi
}
pid() {
pgrep -f "$1"
}
L_exist() { L_exist() {
if [ "$1" == "ssrp" ]; then if [ "$1" == "ssrp" ]; then
uci get shadowsocksr.@global[0].global_server &>/dev/null uci get shadowsocksr.@global[0].global_server &>/dev/null

View File

@@ -10,7 +10,7 @@ PKG_NAME:=qttools
PKG_BASE:=5.15 PKG_BASE:=5.15
PKG_BUGFIX:=2 PKG_BUGFIX:=2
PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX) PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-everywhere-src-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-everywhere-src-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
@@ -27,7 +27,7 @@ PKG_BUILD_DEPENDS:=qtbase
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME) define Package/qttools
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
SUBMENU:=Qt5 SUBMENU:=Qt5
@@ -48,4 +48,4 @@ define Build/InstallDev
$(MAKE) -C $(PKG_BUILD_DIR) install $(MAKE) -C $(PKG_BUILD_DIR) install
endef endef
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,qttools))

View File

@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocks-rust PKG_NAME:=shadowsocks-rust
PKG_VERSION:=1.13.1 PKG_VERSION:=1.13.2
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION) PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION)