From e576193e48074e3c656788a38c22887a4df70473 Mon Sep 17 00:00:00 2001 From: dnomd343 Date: Sat, 12 Mar 2022 11:45:30 +0800 Subject: [PATCH] fix: blocking of init script --- load.sh | 2 +- tproxy.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/load.sh b/load.sh index 5cd61fd..4e7b2bf 100755 --- a/load.sh +++ b/load.sh @@ -330,7 +330,7 @@ load_xray_inbounds [ ! -s "$CONFIG_DIR/dns.json" ] && load_xray_dns cp $CONFIG_DIR/*.json $XRAY_DIR/config/ -tar -C $XRAY_DIR -xf $XRAY_DIR/asset.tar.gz && rm -f $XRAY_DIR/asset.tar.gz +tar -C $XRAY_DIR -xf $XRAY_DIR/asset.tar.gz [ ! -s "$ASSET_DIR/geoip.dat" ] && cp $XRAY_DIR/asset/geoip.dat $ASSET_DIR/ [ ! -s "$ASSET_DIR/geosite.dat" ] && cp $XRAY_DIR/asset/geosite.dat $ASSET_DIR/ [ ! -s "$ASSET_DIR/update.sh" ] && load_update_script diff --git a/tproxy.sh b/tproxy.sh index 3f7df6b..ad03942 100755 --- a/tproxy.sh +++ b/tproxy.sh @@ -73,4 +73,5 @@ custom_script="/etc/xray/expose/custom.sh" [ -f "$custom_script" ] && sh $custom_script echo "[TProxy] Start xray service." -xray -confdir /etc/xray/config +xray -confdir /etc/xray/config & +wait