diff --git a/luci-app-tinyfilemanager/Makefile b/luci-app-tinyfilemanager/Makefile index 4cf8d3c1a..a7e9ba15b 100644 --- a/luci-app-tinyfilemanager/Makefile +++ b/luci-app-tinyfilemanager/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk LUCI_NAME:=luci-app-tinyfilemanager PKG_VERSION:=2.6 -PKG_RELEASE:=20250801 +PKG_RELEASE:=20250804 LUCI_TITLE:=LuCI Tiny File Manager LUCI_DEPENDS:=+php8 +php8-cgi +php8-fastcgi +php8-fpm +php8-mod-session +php8-mod-ctype +php8-mod-fileinfo +php8-mod-zip +php8-mod-iconv +php8-mod-mbstring +coreutils-stat +zoneinfo-asia +bash +curl +tar +inotifywait diff --git a/luci-app-tinyfilemanager/root/etc/config/tinyfilemanager b/luci-app-tinyfilemanager/root/etc/config/tinyfilemanager index aa87cd8ab..fe15fad06 100644 --- a/luci-app-tinyfilemanager/root/etc/config/tinyfilemanager +++ b/luci-app-tinyfilemanager/root/etc/config/tinyfilemanager @@ -9,4 +9,4 @@ config main option show_second '0' option favicon_path '/tinyfilemanager/rootfs/etc/tinyfilemanager/favicon.png' option online_viewer '0' - option defconf '{"lang":"en"}' + diff --git a/luci-app-tinyfilemanager/root/etc/init.d/tinyfilemanager b/luci-app-tinyfilemanager/root/etc/init.d/tinyfilemanager index 1f6a615c7..54fbe11d4 100755 --- a/luci-app-tinyfilemanager/root/etc/init.d/tinyfilemanager +++ b/luci-app-tinyfilemanager/root/etc/init.d/tinyfilemanager @@ -70,7 +70,7 @@ apply_config() { local exclude_items=$(echo "$exclude_items"|sed -E "s/('[^']+'|[^' ]+)/'\1'/g; s|''|'|g; s|' '|',\\\n '|g; s|^| |") -sed -Ei "s|^\\\$CONFIG\s*=.*|\$CONFIG = '$defconf'\;|" "$_conf" +[ -n "$defconf" ] && sed -Ei "s|^\\\$CONFIG\s*=.*|\$CONFIG = '$defconf'\;|" "$_conf" [ "$use_auth" -eq "1" ] && sed -Ei "s|(^\\\$use_auth =)(.+)|\1 true;|" "$_conf" || sed -Ei "s|(^\\\$use_auth =)(.+)|\1 false;|" "$_conf" [ "$global_readonly" -eq "1" ] && sed -Ei "s|(^\\\$global_readonly =)(.+)|\1 true;|" "$_conf" || sed -Ei "s|(^\\\$global_readonly =)(.+)|\1 false;|" "$_conf" sed -Ei "/^\\\$auth_users /,/\);/{/^ /d}" "$_conf" && sed -Ei "/^\\\$auth_users /a\ $auth_users" "$_conf" diff --git a/luci-app-tinyfilemanager/root/etc/uci-defaults/99_luci-app-tinyfilemanager b/luci-app-tinyfilemanager/root/etc/uci-defaults/99_luci-app-tinyfilemanager index 9b2d94151..3a280dac3 100644 --- a/luci-app-tinyfilemanager/root/etc/uci-defaults/99_luci-app-tinyfilemanager +++ b/luci-app-tinyfilemanager/root/etc/uci-defaults/99_luci-app-tinyfilemanager @@ -9,9 +9,4 @@ uci changes uhttpd|grep . >/dev/null && uci commit uhttpd # nginx [ -n "$(command -v nginx)" ] && /etc/init.d/nginx reload -if ! uci -q get tinyfilemanager.@main[0].defconf >/dev/null; then - uci set tinyfilemanager.@main[0].defconf='{"lang":"en"}' - uci commit tinyfilemanager -fi - exit 0 diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 168cc5dad..2a490f2c4 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -30,7 +30,7 @@ define Download/geosite HASH:=01dae2a9c31b5c74ba7e54d8d51e0060688ed22da493eaf09f6eeeec89db395e endef -GEOSITE_IRAN_VER:=202507280048 +GEOSITE_IRAN_VER:=202508040050 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER) define Download/geosite-ir URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/