Merge pull request #4825 from nxhack/node-hid_fix_depends

[feed/packages.git] / net / shadowsocks-libev / files / shadowsocks-libev.init

diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init
index 4226600d96fb40981541720cad3440268f19a785..1b08f41df2cee4ff6c94018c41e2bd071304d0b5 100644 (file)
--- a/net/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/net/shadowsocks-libev/files/shadowsocks-libev.init
@@ -28,9 +28,7 @@ ss_mkjson_() {
        local func
 
        for func in "$@"; do
-               if ! "$func"; then
-                       return 1
-               fi
+               "$func" || return 1
        done
 }
 
@@ -83,7 +81,7 @@ ss_mkjson_ss_redir_conf() {
        ss_mkjson_server_conf || return 1
        [ "$disable_sni" = 0 ] && disable_sni=false || disable_sni=true
        cat <<-EOF
-               ${q}disable_sni${q}: $disable_sni,
+               "disable_sni": $disable_sni,
        EOF
 }
 
@@ -122,7 +120,7 @@ ss_xxx() {
                procd_set_param file "$confjson"
                procd_set_param respawn
                procd_close_instance
-               ss_rules_cb "$cfg"
+               ss_rules_cb
        fi
 }
 
@@ -184,7 +182,7 @@ ss_rules() {
 }
 
 start_service() {
-       local cfgtype="$1"
+       local cfgtype
 
        mkdir -p "$ss_confdir"
        config_load shadowsocks-libev
@@ -287,18 +285,18 @@ validate_ss_rules_section() {
                'disabled:bool:0' \
                'redir_tcp:uci("shadowsocks-libev", "@ss_redir")' \
                'redir_udp:uci("shadowsocks-libev", "@ss_redir")' \
-               'src_ips_bypass:list(or(ip4addr,cidr4))' \
-               'src_ips_forward:list(or(ip4addr,cidr4))' \
-               'src_ips_checkdst:list(or(ip4addr,cidr4))' \
+               'src_ips_bypass:or(ip4addr,cidr4)' \
+               'src_ips_forward:or(ip4addr,cidr4)' \
+               'src_ips_checkdst:or(ip4addr,cidr4)' \
                'dst_ips_bypass_file:file' \
-               'dst_ips_bypass:list(or(ip4addr,cidr4))' \
+               'dst_ips_bypass:or(ip4addr,cidr4)' \
                'dst_ips_forward_file:file' \
-               'dst_ips_forward:list(or(ip4addr,cidr4))' \
+               'dst_ips_forward:or(ip4addr,cidr4)' \
                'src_default:or("bypass", "forward", "checkdst"):checkdst' \
                'dst_default:or("bypass", "forward"):bypass' \
                'local_default:or("bypass", "forward", "checkdst"):bypass' \
                'dst_forward_recentrst:bool:0' \
-               'ifnames:list(maxlength(15))' \
+               'ifnames:maxlength(15)' \
                'ipt_args:string'
 }