From e2f23a7028d1475d46d5456626371613d7242397 Mon Sep 17 00:00:00 2001 From: bol-van Date: Fri, 20 Sep 2024 10:23:38 +0300 Subject: [PATCH] init.d/macos : fix tpws launch --- init.d/macos/custom-tpws | 4 ++-- init.d/macos/functions | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/init.d/macos/custom-tpws b/init.d/macos/custom-tpws index cf3aea6..1f99a0e 100644 --- a/init.d/macos/custom-tpws +++ b/init.d/macos/custom-tpws @@ -6,10 +6,10 @@ zapret_custom_daemons() { # $1 - 1 - run, 0 - stop local opt="--user=root --port=$TPPORT_MY" - filter_apply_hostlist_target opt - filter_apply_suffix opt "$TPWS_OPT_SUFFIX" tpws_apply_binds opt opt="$opt $TPWS_OPT" + filter_apply_hostlist_target opt + filter_apply_suffix opt "$TPWS_OPT_SUFFIX" do_daemon $1 1 "$TPWS" "$opt" } diff --git a/init.d/macos/functions b/init.d/macos/functions index d5d9ca9..4fb826f 100644 --- a/init.d/macos/functions +++ b/init.d/macos/functions @@ -163,10 +163,10 @@ zapret_do_daemons() } # MacOS requires root. kernel hardcoded requirement for /dev/pf ioctls opt="--user=root --port=$TPPORT" - filter_apply_hostlist_target opt - filter_apply_suffix opt "$TPWS_OPT_SUFFIX" tpws_apply_binds opt opt="$opt $TPWS_OPT" + filter_apply_hostlist_target opt + filter_apply_suffix opt "$TPWS_OPT_SUFFIX" do_daemon $1 1 "$TPWS" "$opt" ;; tpws-socks) @@ -176,9 +176,9 @@ zapret_do_daemons() } opt="--socks --user=$WS_USER --port=$TPPORT" tpws_apply_socks_binds opt + opt="$opt $TPWS_OPT" filter_apply_hostlist_target opt filter_apply_suffix opt "$TPWS_OPT_SUFFIX" - opt="$opt $TPWS_OPT" do_daemon $1 1 "$TPWS" "$opt" ;; filter)