update 2022-06-15 20:18:39

This commit is contained in:
github-actions[bot] 2022-06-15 20:18:39 +08:00
parent b1e428672c
commit 4ad0a55eb3
9 changed files with 50 additions and 39 deletions

View File

@ -6,10 +6,10 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for quickstart
LUCI_DEPENDS:=+quickstart +shadow-utils +shadow-useradd +luci-app-store +mount-utils
LUCI_DEPENDS:=+quickstart +luci-app-store
LUCI_PKGARCH:=all
PKG_VERSION:=0.4.8-1
PKG_VERSION:=0.4.8-3
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=

View File

@ -8,9 +8,11 @@ function index()
if luci.sys.call("pgrep quickstart >/dev/null") == 0 then
entry({"admin", "quickstart"}, call("redirect_index"), _("QuickStart"), 1)
entry({"admin", "network_guide"}, call("networkguide_index"), _("NetworkGuide"), 2)
entry({"admin", "quickstart", "pages"}, call("quickstart_index")).leaf = true
entry({"admin", "quickstart", "pages"}, call("quickstart_index", {index={"admin", "quickstart", "pages"}})).leaf = true
entry({"admin", "network_guide", "pages"}, call("quickstart_index", {index={"admin", "network_guide", "pages"}})).leaf = true
if nixio.fs.access("/usr/lib/lua/luci/view/quickstart/main_dev.htm") then
entry({"admin", "quickstart", "dev"}, call("quickstart_dev")).leaf = true
entry({"admin", "quickstart", "dev"}, call("quickstart_dev", {index={"admin", "quickstart", "dev"}})).leaf = true
entry({"admin", "network_guide", "dev"}, call("quickstart_dev", {index={"admin", "network_guide", "dev"}})).leaf = true
end
else
entry({"admin", "quickstart"})
@ -19,7 +21,7 @@ function index()
end
function networkguide_index()
luci.http.redirect(luci.dispatcher.build_url("admin","quickstart","pages","network"))
luci.http.redirect(luci.dispatcher.build_url("admin","network_guide","pages","network"))
end
function redirect_index()
@ -30,10 +32,18 @@ function redirect_fallback()
luci.http.redirect(luci.dispatcher.build_url("admin","status"))
end
function quickstart_index()
luci.template.render("quickstart/main", {prefix=luci.dispatcher.build_url(unpack(page_index))})
function quickstart_index(param)
local jsonc = require "luci.jsonc"
local features = { "_lua_force_array_" }
if luci.sys.call("which ota >/dev/null 2>&1") == 0 then
features[#features+1] = "ota"
end
if luci.sys.call("[ -d /ext_overlay ] >/dev/null 2>&1") == 0 then
features[#features+1] = "sandbox"
end
luci.template.render("quickstart/main", {prefix=luci.dispatcher.build_url(unpack(param.index)),features=jsonc.stringify(features)})
end
function quickstart_dev()
luci.template.render("quickstart/main_dev", {prefix=luci.dispatcher.build_url(unpack({"admin", "quickstart", "dev"}))})
function quickstart_dev(param)
luci.template.render("quickstart/main_dev", {prefix=luci.dispatcher.build_url(unpack(param.index))})
end

View File

@ -3,6 +3,7 @@
(function(){
var vue_prefix="<%=prefix%>";
window.vue_base = vue_prefix + '/';
window.quickstart_features = <%=features%>;
})();
</script>
<div id="app">

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -94,16 +94,12 @@ add_wizard() {
uci -q set network.wan.ipv6='0'
uci -q set network.wan.delegate='0'
uci -q delete network.globals.ula_prefix
/etc/init.d/odhcpd disable
/etc/init.d/odhcpd stop
else
uci -q set dhcp.lan.ra='hybrid'
uci -q set dhcp.lan.dhcpv6='hybrid'
uci -q del network.lan.delegate
uci -q set network.wan.ipv6='auto'
uci -q del network.wan.delegate
/etc/init.d/odhcpd enable
/etc/init.d/odhcpd start
fi
uci -q set wizard.default.old_ipv6="${ipv6}"
fi

View File

@ -84,22 +84,26 @@ test $version -lt 1 && {
uci -q get wireless.${radio} >/dev/null 2>&1 && {
uci -q del wireless.${radio}.disabled
uci -q set wireless.${radio}.country='US'
uci -q set wireless.${radio}.channel='auto'
if [ "$(uci -q get wireless.${radio}.band)" = "5g" ]; then
uci -q set wireless.default_${radio}.ssid="${SSID}_5G"
if test -z "${htmode##HE*}"; then
if [[ $htmode == "HE20" || $htmode == "HE40" ]]; then
uci -q set wireless.${radio}.htmode="HE80"
fi
uci -q set wireless.${radio}.htmode="HE160"
uci -q set wireless.${radio}.channel='44'
else
uci -q set wireless.${radio}.htmode="VHT80"
uci -q set wireless.${radio}.channel="157"
fi
[ "$(cat /tmp/sysinfo/board_name)" == "xiaomi_mi-router-cr660x" ] && {
uci -q set wireless.${radio}.htmode="HE80"
uci -q set wireless.${radio}.channel='157'
}
else
uci -q set wireless.${radio}.htmode="HT40"
uci -q set wireless.${radio}.noscan='1'
uci -q set wireless.${radio}.vendor_vht='1'
uci -q set wireless.default_${radio}.ssid="${SSID}_2.4G"
uci -q set wireless.${radio}.channel='auto'
fi
uci -q set wireless.default_${radio}.device="${radio}"
if [ "${SSID_PASSWD}" ]; then

View File

@ -11,7 +11,7 @@ PKG_ARCH_quickstart:=$(ARCH)
PKG_NAME:=quickstart
PKG_VERSION:=0.4.8
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:=236dcba61010b88706b152a359cb85c563c27febaa6b0c341b61cf4549e48920
@ -28,7 +28,7 @@ define Package/$(PKG_NAME)
CATEGORY:=Network
SUBMENU:=Web Servers/Proxies
TITLE:=Quickstart, the quick start.
DEPENDS:=@(x86_64||aarch64)
DEPENDS:=@(x86_64||aarch64) +shadow-utils +shadow-useradd +mount-utils +lsblk +e2fsprogs +parted
URL:=https://easepi.linkease.com/
endef