From 62f6c70a39eee23155ae1a756b61f38e8a6aad83 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 10 May 2020 11:48:57 +0800 Subject: [PATCH 1/2] OpenClash: sync with upstream source --- .../files/usr/lib/lua/luci/controller/openclash.lua | 2 +- .../openclash/cfg_servers_address_fake_filter.sh | 0 .../usr/share/openclash/openclash_fake_filter.sh | 2 +- .../usr/share/rpcd/acl.d/luci-app-openclash.json | 11 ----------- 4 files changed, 2 insertions(+), 13 deletions(-) mode change 100644 => 100755 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh mode change 100644 => 100755 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua index 56f6835863..0892565250 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua @@ -6,7 +6,7 @@ function index() end local page - + page = entry({"admin", "services", "openclash"}, alias("admin", "services", "openclash", "client"), _("OpenClash"), 50) page.dependent = true page.acl_depends = { "luci-app-openclash" } diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh old mode 100644 new mode 100755 diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh old mode 100644 new mode 100755 index 5389ac3e98..be72f9079e --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh @@ -43,4 +43,4 @@ cfg_server_address() rm -rf "$SER_FAKE_FILTER_FILE" 2>/dev/null config_load "openclash" -config_foreach cfg_server_address "servers" +config_foreach cfg_server_address "servers" \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json b/package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json deleted file mode 100644 index 8214de2101..0000000000 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "luci-app-openclash": { - "description": "Grant UCI access for luci-app-openclash", - "read": { - "uci": [ "openclash" ] - }, - "write": { - "uci": [ "openclash" ] - } - } -} \ No newline at end of file From e72aec648f6364d78d8d86e493994877a29aece1 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 10 May 2020 11:52:24 +0800 Subject: [PATCH 2/2] luci-app-rclone: sync with upstream source --- package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone b/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone index b5dbc71094..03f8fc39c4 100755 --- a/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone +++ b/package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone @@ -32,6 +32,9 @@ init_config() { [ -f "$config_path" ] || touch "$config_path" + [ -d "/lib/upgrade/keep.d" ] || mkdir -p /lib/upgrade/keep.d/luci-app-rclone 2>/dev/null + echo "$config_path" > /lib/upgrade/keep.d/luci-app-rclone + log_dir=${log_path%/*} [ -d "$log_dir" ] || mkdir -p "$log_dir" 2>/dev/null && echo /dev/null > "$log_path"