update 2022-09-13 20:25:56

This commit is contained in:
github-actions[bot] 2022-09-13 20:25:56 +08:00
parent e7032402a2
commit 5c5f8acc2e
9 changed files with 40 additions and 18 deletions

View File

@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for quickstart
LUCI_DEPENDS:=+quickstart +luci-app-store
LUCI_PKGARCH:=all
PKG_VERSION:=0.5.4-2
PKG_VERSION:=0.5.6-1
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -11,13 +11,13 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua
LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.17)
LUCI_PKGARCH:=all
PKG_VERSION:=0.1.12-5
PKG_VERSION:=0.1.12-7
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=
ISTORE_UI_VERSION:=0.1.12
ISTORE_UI_RELEASE:=3
PKG_HASH:=d3772c01c0ffcf27cf60e6f0890989fd940459a6d115500f2c42dc204c1a162c
ISTORE_UI_RELEASE:=4
PKG_HASH:=501ba105bcd60030f8f99768b76b0ca083027ef44f7f5b99c039174472fe5c5a
PKG_SOURCE_URL_FILE:=v$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE).tar.gz
PKG_SOURCE:=istore-ui-$(PKG_SOURCE_URL_FILE)

View File

@ -19,7 +19,7 @@
window.vue_lang = '<%=lang%>';
window.token = "<%=token%>";
window.device_id = {arch:"<%=id.arch%>",uid:"<%=id.uid%>",version:"<%=id.version%>"};
window.istore_features = <%=jsonc.stringify(features)%>;
window.istore_features = <%=jsonc.stringify(features)%>.filter(f => f !== '_lua_force_array_');
})();
</script>
<h2 name="content"><%:iStore%>

View File

@ -40,6 +40,15 @@ fcurl() {
curl --fail --show-error "$@"
}
check_space() {
local free="$((`stat -c '%a * %S' -f /` >> 20 ))"
if [ "$free" -lt 1 ]; then
echo "Root disk full!" >&2
exit 1
fi
return 0
}
update() {
if [ -z "${ARCH}" ]; then
echo "Get architecture failed" >&2
@ -148,6 +157,7 @@ case $action in
update
;;
"install")
check_space
wrapped_in_update install "$@"
;;
"upgrade")
@ -166,6 +176,7 @@ case $action in
check_self_upgrade
;;
"do_self_upgrade")
check_space
do_self_upgrade
;;
"opkg")

View File

@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
PKG_ARCH_quickstart:=$(ARCH)
PKG_NAME:=quickstart
PKG_VERSION:=0.5.4
PKG_RELEASE:=3
PKG_VERSION:=0.5.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://fw.koolcenter.com/binary/quickstart/
PKG_HASH:=78e69598982302e3cc1d59d1192b758b8b8d463c4bc88c6e5d0ed07242d1e9de
PKG_HASH:=e754732d68c04d73b3ed2d11884056e371c2984f63a90c4b3b1ed44aba4a6e5b
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)
@ -41,7 +41,10 @@ endef
define Package/$(PKG_NAME)/postinst
#!/bin/sh
if [ -z "$${IPKG_INSTROOT}" ]; then
[ -f /etc/uci-defaults/quickstart ] && /etc/uci-defaults/quickstart && rm -f /etc/uci-defaults/quickstart
if [ -f /etc/uci-defaults/09-quickstart ]; then
chmod 755 /etc/uci-defaults/09-quickstart
/etc/uci-defaults/09-quickstart && rm -f /etc/uci-defaults/09-quickstart
fi
fi
endef

View File

@ -48,6 +48,7 @@ handle_part() {
if [ "$DETECT" = "1" ]; then
[ -z "$MOUNT" ] && return 0
# in this case, only add mounted device: boot,root,overlayfs, and disable them
log "add mount $UUID => $MOUNT"
uci -q batch <<-EOF >/dev/null
add fstab mount
@ -86,7 +87,7 @@ if [ "$1" = "detect" ]; then
cat <<-EOF >/etc/config/fstab
config global
option anon_swap '0'
option anon_mount '1'
option anon_mount '0'
option auto_swap '1'
option auto_mount '1'
option delay_root '5'
@ -101,4 +102,11 @@ config_load fstab
scan_all
[ "$DETECT" = "1" ] && uci commit fstab
if [ "$DETECT" = "1" ]; then
uci commit fstab
sleep 2
uci -q batch <<-EOF >/dev/null
set fstab.@global[0].anon_mount=1
commit fstab
EOF
fi

View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sing-box
PKG_VERSION:=1.0.2
PKG_VERSION:=1.0.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=6b2c6a8b6d4a0e715350e704a824e1f0446e5020652ae3d86005ba939b7abefc
PKG_HASH:=b0836fbbd4933c8f5d00c47d6b93099a6b7e32bd352c06fd8c0ae71e648a9c88
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE
@ -38,7 +38,7 @@ define Package/sing-box
endef
GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=0
GO_PKG_TAGS:=with_quic,with_wireguard,with_acme
GO_PKG_TAGS:=with_quic,with_grpc,with_wireguard
define Package/$(PKG_NAME)/conffiles
/etc/sing-box/config.json