update 2023-03-16 23:10:23

This commit is contained in:
github-actions[bot] 2023-03-16 23:10:23 +08:00
parent e0d07a27b3
commit a11598aa1e
9 changed files with 51 additions and 32 deletions

View File

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=alist
PKG_VERSION:=3.13.2
PKG_WEB_VERSION:=3.13.2
PKG_VERSION:=3.14.0
PKG_WEB_VERSION:=3.14.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=9a416a37a8576e4e1750f61c07ddd2c0974503b6035085401dcec50ab3fa0b1b
PKG_HASH:=1eb53bb32eb95db0be695e16fad70b6a2da1c984cea9fb0879da86a83ed54188
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE
@ -23,7 +23,7 @@ define Download/$(PKG_NAME)-web
FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
URL_FILE:=dist.tar.gz
URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/
HASH:=8c1503184883b20abdd5bd893e90f0470dc90ff2367bb1f7c4829b452e6775a3
HASH:=05d87c5b874e209c2016126eb75c3837decdfb99982f2f85adcd9502f9f61af7
endef
PKG_BUILD_DEPENDS:=golang/host

View File

@ -16,7 +16,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-amlogic
PKG_VERSION:=3.1.162
PKG_VERSION:=3.1.163
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 License

View File

@ -9,16 +9,18 @@ function index()
page.dependent = true
page.acl_depends = { "luci-app-amlogic" }
local platfrom = luci.sys.exec("cat /etc/flippy-openwrt-release 2>/dev/null | grep PLATFORM | awk -F'=' '{print $2}' | grep -oE '(amlogic|rockchip|allwinner|qemu)'") or "Unknown"
local platfrom = luci.sys.exec("cat /etc/flippy-openwrt-release 2>/dev/null | grep PLATFORM | awk -F'=' '{print $2}' | grep -oE '(amlogic|rockchip|allwinner|qemu)' | xargs") or "Unknown"
local install_menu = luci.sys.exec("cat /etc/flippy-openwrt-release 2>/dev/null | grep SHOW_INSTALL_MENU | awk -F'=' '{print $2}' | grep -oE '(yes|no)' | xargs") or "Unknown"
entry({ "admin", "system", "amlogic", "info" }, cbi("amlogic/amlogic_info"), _("Amlogic Service"), 1).leaf = true
if (string.find(platfrom, "amlogic")) ~= nil then
entry({ "admin", "system", "amlogic", "install" }, cbi("amlogic/amlogic_install"), _("Install OpenWrt"), 2).leaf = true
if (string.find(platfrom, "amlogic")) ~= nil or (string.find(install_menu, "yes")) ~= nil then
entry({ "admin", "system", "amlogic", "install" }, cbi("amlogic/amlogic_install"), _("Install OpenWrt"), 2).leaf = true
end
entry({ "admin", "system", "amlogic", "upload" }, cbi("amlogic/amlogic_upload"), _("Manually Upload Update"), 3).leaf = true
entry({ "admin", "system", "amlogic", "check" }, cbi("amlogic/amlogic_check"), _("Online Download Update"), 4).leaf = true
entry({ "admin", "system", "amlogic", "backup" }, cbi("amlogic/amlogic_backup"), _("Backup Firmware Config"), 5).leaf = true
if (string.find(platfrom, "qemu")) == nil then
entry({ "admin", "system", "amlogic", "armcpu" }, cbi("amlogic/amlogic_armcpu"), _("CPU Settings"), 6).leaf = true
entry({ "admin", "system", "amlogic", "armcpu" }, cbi("amlogic/amlogic_armcpu"), _("CPU Settings"), 6).leaf = true
end
entry({ "admin", "system", "amlogic", "config" }, cbi("amlogic/amlogic_config"), _("Plugin Settings"), 7).leaf = true
entry({ "admin", "system", "amlogic", "log" }, cbi("amlogic/amlogic_log"), _("Server Logs"), 8).leaf = true
@ -82,13 +84,13 @@ else
end
--Device identification
device_platfrom = trim(luci.sys.exec("cat /etc/flippy-openwrt-release 2>/dev/null | grep PLATFORM | awk -F'=' '{print $2}' | grep -oE '(amlogic|rockchip|allwinner|qemu)'")) or "Unknown"
device_platfrom = luci.sys.exec("cat /etc/flippy-openwrt-release 2>/dev/null | grep PLATFORM | awk -F'=' '{print $2}' | grep -oE '(amlogic|rockchip|allwinner|qemu)' | xargs") or "Unknown"
if (string.find(device_platfrom, "rockchip")) ~= nil then
device_install_script = ""
device_update_script = "openwrt-update-rockchip"
device_kernel_script = "openwrt-kernel"
elseif (string.find(device_platfrom, "allwinner")) ~= nil then
device_install_script = ""
device_install_script = "openwrt-install-allwinner"
device_update_script = "openwrt-update-allwinner"
device_kernel_script = "openwrt-kernel"
elseif (string.find(device_platfrom, "qemu")) ~= nil then
@ -409,8 +411,11 @@ end
--Read external model database
local function my_model_database()
local state = luci.sys.exec("cat /etc/model_database.txt | grep -E '^[0-9]{1,9}.*:' | awk -F ':' '{print $1,$2}' OFS='###' ORS='@@@' | tr ' ' '~' 2>&1")
return state
if (string.find(device_platfrom, "allwinner")) ~= nil then
return luci.sys.exec("cat /etc/model_database.txt 2>/dev/null | grep -E '^w[0-9]{1,9}.*:' | awk -F ':' '{print $1,$2}' OFS='###' ORS='@@@' | tr ' ' '~' 2>&1")
else
return luci.sys.exec("cat /etc/model_database.txt 2>/dev/null | grep -E '^[0-9]{1,9}.*:' | awk -F ':' '{print $1,$2}' OFS='###' ORS='@@@' | tr ' ' '~' 2>&1")
end
end
--Return external model database

View File

@ -115,7 +115,7 @@
my_box_mode = user_arry[j].split('###');
my_box_mode_id = my_box_mode[0];
my_box_mode_name = my_box_mode[1];
if ( parseFloat(my_box_mode_id).toString() != "NaN" && my_box_mode_name != "" ) {
if ( my_box_mode_id != "" && my_box_mode_name != "" ) {
_option_codes = _option_codes + '<option value="' + my_box_mode_id + '">[ ' + my_box_mode_id + ' ] ' + my_box_mode_name.replace(/~/g, " ") + '</option>';
}
}

View File

@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Design Theme
LUCI_DEPENDS:=
PKG_VERSION:=5.4.8
PKG_RELEASE:=20230312
PKG_VERSION:=5.4.9
PKG_RELEASE:=20230316
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -46,7 +46,7 @@
--logo_color: #222b36;
--alertColor: #000000;
--alertBackground: rgb(230 230 230);
--scrollbarColor:#d0d0d0;
--scrollbarColor:#c5c5c5;
--ifaceboxBorderColor: #b8b8b8bd;
--ifaceboxFontColor: #404040;
--liSelectedColor: #c5c5c5;
@ -90,7 +90,7 @@
--logo_color: #fefefe;
--alertColor: #ffffff;
--alertBackground: rgb(30 30 30);
--scrollbarColor:#222;
--scrollbarColor:#2f2f2f;
--ifaceboxBorderColor: #636363bd;
--ifaceboxFontColor: #404040;
--liSelectedColor: #2f2f2f;

File diff suppressed because one or more lines are too long

View File

@ -18,9 +18,6 @@
Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 David Menting <david@nut-bolt.nl>
luci-theme-neobird:
Copyright 2021 2smile <thinktip@gmail.com>
MUI:
https://github.com/muicss/mui
@ -176,7 +173,11 @@
</style>
</head>
<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>"
<% if mode ~= 'normal' then %>
data-theme = "<%= mode %>"
<% end -%>
>
<header>
@ -187,8 +188,6 @@
window.matchMedia && color_scheme.addEventListener('change', (event) => {
document.body.setAttribute('data-theme', event.matches? 'dark' : 'light');
})
<% else %>
document.body.setAttribute('data-theme', '<%= mode %>' === 'dark' ? 'dark' : 'light');
<% end -%>
</script>
@ -243,11 +242,26 @@
<span class="label" id="xhr_poll_status_off" style="display:none"><span id="refresh_off" class="mobile-hide"></span></span>
</span>
<script>
const pollStatus = document.getElementById('xhr_poll_status');
const notice = document.querySelector('.notice');
if (pollStatus) {
notice.style.marginRight = pollStatus.style.display === 'none' ? '0' : '30px';
}
const pollStatus = document.querySelector('#xhr_poll_status');
const notice = document.querySelector('.notice');
function updateMarginRight() {
if (pollStatus.style.display === '') {
notice.style.marginRight = '30px';
}
if (pollStatus.style.display === 'none') {
notice.style.marginRight = '0';
}
}
updateMarginRight();
const observer = new MutationObserver(function(mutationsList) {
for (let mutation of mutationsList) {
if (mutation.type === 'attributes' && mutation.attributeName === 'style') {
updateMarginRight();
}
}
});
const config = { attributes: true, attributeFilter: ['style'] };
observer.observe(pollStatus, config);
</script>
<% end %>
</div>

View File

@ -11,7 +11,7 @@ PKG_ARCH_quickstart:=$(ARCH)
PKG_NAME:=quickstart
PKG_VERSION:=0.6.10
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://fw.koolcenter.com/binary/quickstart/
PKG_HASH:=00cd3d664593a4fe81149e13fc85e89493c6b164ac8b672d73e0dc9c13939b28
@ -28,7 +28,7 @@ define Package/$(PKG_NAME)
CATEGORY:=Network
SUBMENU:=Web Servers/Proxies
TITLE:=Quickstart, the quick start.
DEPENDS:=@(x86_64||aarch64||arm) +shadow-utils +shadow-useradd +mount-utils +lsblk +e2fsprogs +parted +smartmontools +smartd +mdadm
DEPENDS:=@(x86_64||aarch64||arm) +shadow-utils +shadow-useradd +mount-utils +block-mount +lsblk +e2fsprogs +parted +smartmontools +smartd +mdadm +ip-full +ubus +uci
URL:=https://easepi.linkease.com/
endef