From 742415490ee880ff4c9f3d9b50fcb61ab61ee544 Mon Sep 17 00:00:00 2001 From: Max Zhao Date: Tue, 17 Mar 2020 01:38:56 +0800 Subject: [PATCH] luci-app-ssr-plus: improve the generation of shadowsocks configuration file (#3838) --- .../luci-app-ssr-plus/root/etc/init.d/shadowsocksr | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index d39344893f..7d5480e301 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -108,11 +108,15 @@ gen_config_file() { } EOF local plugin=$(uci_get_by_name $1 plugin) - if [ -n "$plugin" ] && [ "$plugin" == "simple-obfs" ]; then - plugin="obfs-local" - fi - if [ -n "$plugin" -a -x "/usr/bin/$plugin" ]; then - sed -i "s@$hostip\",@$hostip\",\n\"plugin\": \"$plugin\",\n\"plugin_opts\": \"$(uci_get_by_name $1 plugin_opts)\",@" $config_file + if [ -n "$plugin" ]; then + if [ "$plugin" == "simple-obfs" ]; then + plugin="obfs-local" + fi + if [ -x "/usr/bin/$plugin" ]; then + sed -i "s@$hostip\",@$hostip\",\n\"plugin\": \"$plugin\",\n\"plugin_opts\": \"$(uci_get_by_name $1 plugin_opts)\",@" $config_file + else + echo "$(date "+%Y-%m-%d %H:%M:%S") Warning!!! SIP003 plugin $plugin not found!!!" >>/tmp/ssrplus.log + fi fi elif [ "$stype" == "ssr" ]; then cat <<-EOF >$config_file