From 9e84c753223c3fd1a7f6429a95b6e766986db7e0 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Sat, 18 Jan 2025 15:30:16 +0800 Subject: [PATCH] luci-app-ssr-plus: sync upstream last commit: https://github.com/fw876/helloworld/commit/32940b97b6d59850e437a3c6b7b3f8504b902b4f --- luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua | 2 +- patch-luci-app-ssr-plus.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua index eb7ccb701..75e141feb 100644 --- a/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -151,7 +151,7 @@ function create_backup() "/etc/config/shadowsocksr", "/etc/ssrplus/*" } - local date = os.date("%Y%m%d") + local date = os.date("%Y-%m-%d-%H-%M-%S") local tar_file = "/tmp/shadowsocksr-" .. date .. "-backup.tar.gz" nixio.fs.remove(tar_file) local cmd = "tar -czf " .. tar_file .. " " .. table.concat(backup_files, " ") diff --git a/patch-luci-app-ssr-plus.patch b/patch-luci-app-ssr-plus.patch index 7c4d31e89..c50bb2301 100644 --- a/patch-luci-app-ssr-plus.patch +++ b/patch-luci-app-ssr-plus.patch @@ -121,7 +121,7 @@ index b469328..3a0b055 100644 bool "Include ShadowsocksR Libev Client" default y diff --git a/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua -index 0469b87..eb7ccb7 100644 +index 31989b0..75e141f 100644 --- a/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -7,7 +7,7 @@ function index()