diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index 48475037b..0c2596b3f 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -79,53 +79,65 @@ ss_mkjson_common_conf() { ss_mkjson_ss_local_conf() { ss_mkjson_server_conf [ "$obfs" = 0 ] && obfs=false || obfs=true - obfs_options="--obfs $obfs_type" - [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" - [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" - [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" - [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" - cat <<-EOF - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} - EOF + if $obfs; then + obfs_options="--obfs $obfs_type" + [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" + [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" + [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" + [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" + cat <<-EOF + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} + EOF + fi } ss_mkjson_ss_redir_conf() { ss_mkjson_server_conf || return 1 [ "$disable_sni" = 0 ] && disable_sni=false || disable_sni=true - [ "$obfs" = 0 ] && obfs=false || obfs=true - obfs_options="--obfs $obfs_type" - [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" - [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" - [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" - [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" cat <<-EOF "disable_sni": $disable_sni, - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} EOF + [ "$obfs" = 0 ] && obfs=false || obfs=true + if $obfs; then + obfs_options="--obfs $obfs_type" + [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" + [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" + [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" + [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" + cat <<-EOF + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} + EOF + fi } ss_mkjson_ss_server_conf() { ss_mkjson_server_conf_ [ "$obfs" = 0 ] && obfs=false || obfs=true - obfs_options="--obfs $obfs_type" - [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" - [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" - cat <<-EOF - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server $obfs_options${q},} - EOF + if $obfs; then + obfs_options="--obfs $obfs_type" + [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" + [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" + cat <<-EOF + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server $obfs_options${q},} + EOF + fi } ss_mkjson_ss_tunnel_conf() { ss_mkjson_server_conf || return 1 [ -n "$tunnel_address" ] || return 1 - [ "$obfs" = 0 ] && obfs=false || obfs=true - obfs_options="--obfs $obfs_type" - [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" - [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" cat <<-EOF ${tunnel_address:+${q}tunnel_address${q}: ${q}$tunnel_address${q},} - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} EOF + [ "$obfs" = 0 ] && obfs=false || obfs=true + if $obfs; then + obfs_options="--obfs $obfs_type" + [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" + [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" + cat <<-EOF + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} + EOF + fi } ss_xxx() {