From 0738bbb43c1ee7d569b434eef533bd0afac8279d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 19 Mar 2022 20:31:23 +0800
Subject: [PATCH] update 03-19 20:31
---
UnblockNeteaseMusic/Makefile | 4 ++--
luci-app-bypass/root/usr/share/bypass/update | 2 +-
luci-app-quickstart/Makefile | 2 +-
.../luasrc/view/quickstart/landing.htm | 16 ++++++++++++++++
.../share/luci/menu.d/luci-app-quickstart.json | 10 ++++++++++
5 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 luci-app-quickstart/luasrc/view/quickstart/landing.htm
create mode 100644 luci-app-quickstart/root/usr/share/luci/menu.d/luci-app-quickstart.json
diff --git a/UnblockNeteaseMusic/Makefile b/UnblockNeteaseMusic/Makefile
index 7015f7c94..c52b34f61 100644
--- a/UnblockNeteaseMusic/Makefile
+++ b/UnblockNeteaseMusic/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=UnblockNeteaseMusic
PKG_BASE_VERSION:=0.27.0-rc.4
-PKG_RELEASE:=99
+PKG_RELEASE:=100
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
PKG_SOURCE_DATE:=2021-12-21
-PKG_SOURCE_VERSION:=729bd0527655cb2696110c7c0d244a6eb297be8f
+PKG_SOURCE_VERSION:=6cfe05e37049780ad43a65dbf72c602e3b82f341
PKG_MIRROR_HASH:=skip
PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
diff --git a/luci-app-bypass/root/usr/share/bypass/update b/luci-app-bypass/root/usr/share/bypass/update
index 2b3ab7d1d..b7b25ef44 100755
--- a/luci-app-bypass/root/usr/share/bypass/update
+++ b/luci-app-bypass/root/usr/share/bypass/update
@@ -52,7 +52,7 @@ if [ "$C" = gfw -o "$(uci -q get bypass.@global[0].gfw_mode)" = 1 ];then
while ! (curl -kLfsm 3 -o /tmp/gfw.b64 https://op.supes.top/gfwlist.txt || curl -kLfsm 5 -o /tmp/gfw.b64 https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt);do
sleep 1
done
- elif [ "$C" = gfw ];then
+ elif [ "$C" = gfw -o $A = N ];then
curl -kLfsm 3 -o /tmp/gfw.b64 https://op.supes.top/gfwlist.txt || curl -kLfsm 5 -o /tmp/gfw.b64 https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt
fi
if [[ -f /tmp/gfw.b64 && $? == 0 ]];then
diff --git a/luci-app-quickstart/Makefile b/luci-app-quickstart/Makefile
index 15b84bf50..a650c1d37 100644
--- a/luci-app-quickstart/Makefile
+++ b/luci-app-quickstart/Makefile
@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for quickstart
LUCI_DEPENDS:=+quickstart +shadow-utils +shadow-useradd +luci-app-store
LUCI_PKGARCH:=all
-PKG_VERSION:=0.3.1-2
+PKG_VERSION:=0.3.1-3
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=
diff --git a/luci-app-quickstart/luasrc/view/quickstart/landing.htm b/luci-app-quickstart/luasrc/view/quickstart/landing.htm
new file mode 100644
index 000000000..1f6580fab
--- /dev/null
+++ b/luci-app-quickstart/luasrc/view/quickstart/landing.htm
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+ Landing to main page
+
+
diff --git a/luci-app-quickstart/root/usr/share/luci/menu.d/luci-app-quickstart.json b/luci-app-quickstart/root/usr/share/luci/menu.d/luci-app-quickstart.json
new file mode 100644
index 000000000..ec8db55f6
--- /dev/null
+++ b/luci-app-quickstart/root/usr/share/luci/menu.d/luci-app-quickstart.json
@@ -0,0 +1,10 @@
+{
+ "admin/quickstart": {
+ "title": "QuickStart",
+ "order": 1,
+ "action": {
+ "type": "template",
+ "path": "quickstart/landing"
+ }
+ }
+}
\ No newline at end of file