From 9be93ec1ae96af4f575654d23b552829bb1a339b Mon Sep 17 00:00:00 2001 From: actions Date: Mon, 27 May 2024 20:00:07 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/19640fcbda2c62785fae7a433710ca8bffbdf29b --- luci-app-passwall/root/usr/share/passwall/rule_update.lua | 5 +---- luci-app-passwall/root/usr/share/passwall/subscribe.lua | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/luci-app-passwall/root/usr/share/passwall/rule_update.lua b/luci-app-passwall/root/usr/share/passwall/rule_update.lua index 4db7e26ae..469e4ea02 100755 --- a/luci-app-passwall/root/usr/share/passwall/rule_update.lua +++ b/luci-app-passwall/root/usr/share/passwall/rule_update.lua @@ -466,11 +466,8 @@ luci.sys.call("uci commit " .. name) if reboot == 1 then if arg3 == "cron" then - local f = io.open("/var/lock/" .. name .. ".lock", "r") - if f == nil then + if not nixio.fs.access("/var/lock/" .. name .. ".lock") then luci.sys.call("touch /tmp/lock/" .. name .. "_cron.lock") - else - f:close() end end diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 8fe660179..edf23b44f 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1166,11 +1166,8 @@ local function update_node(manual) end if arg[3] == "cron" then - local f = io.open("/var/lock/" .. appname .. ".lock", "r") - if f == nil then + if not nixio.fs.access("/var/lock/" .. appname .. ".lock") then luci.sys.call("touch /tmp/lock/" .. appname .. "_cron.lock") - else - f:close() end end