Merge remote-tracking branch 'upstream/develop' into upstream_master

pull/129/head
IceCodeNew 2020-09-22 22:15:40 +08:00
commit 012d9beeeb
1 changed files with 12 additions and 12 deletions

View File

@ -320,7 +320,7 @@ install_v2ray() {
if [[ -n "$JSONS_PATH" ]] && [[ ! -d "$JSONS_PATH" ]]; then if [[ -n "$JSONS_PATH" ]] && [[ ! -d "$JSONS_PATH" ]]; then
install -d "$JSONS_PATH" install -d "$JSONS_PATH"
for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do
echo '{}' >"${JSONS_PATH}$BASE.json" echo '{}' > "${JSONS_PATH}/${BASE}.json"
done done
CONFDIR='1' CONFDIR='1'
fi fi
@ -527,19 +527,19 @@ main() {
echo "installed: ${DAT_PATH}/geosite.dat" echo "installed: ${DAT_PATH}/geosite.dat"
fi fi
if [[ "$CONFIG_NEW" -eq '1' ]]; then if [[ "$CONFIG_NEW" -eq '1' ]]; then
echo "installed: ${JSON_PATH}config.json" echo "installed: ${JSON_PATH}/config.json"
fi fi
if [[ "$CONFDIR" -eq '1' ]]; then if [[ "$CONFDIR" -eq '1' ]]; then
echo "installed: ${JSON_PATH}00_log.json" echo "installed: ${JSON_PATH}/00_log.json"
echo "installed: ${JSON_PATH}01_api.json" echo "installed: ${JSON_PATH}/01_api.json"
echo "installed: ${JSON_PATH}02_dns.json" echo "installed: ${JSON_PATH}/02_dns.json"
echo "installed: ${JSON_PATH}03_routing.json" echo "installed: ${JSON_PATH}/03_routing.json"
echo "installed: ${JSON_PATH}04_policy.json" echo "installed: ${JSON_PATH}/04_policy.json"
echo "installed: ${JSON_PATH}05_inbounds.json" echo "installed: ${JSON_PATH}/05_inbounds.json"
echo "installed: ${JSON_PATH}06_outbounds.json" echo "installed: ${JSON_PATH}/06_outbounds.json"
echo "installed: ${JSON_PATH}07_transport.json" echo "installed: ${JSON_PATH}/07_transport.json"
echo "installed: ${JSON_PATH}08_stats.json" echo "installed: ${JSON_PATH}/08_stats.json"
echo "installed: ${JSON_PATH}09_reverse.json" echo "installed: ${JSON_PATH}/09_reverse.json"
fi fi
if [[ "$LOG" -eq '1' ]]; then if [[ "$LOG" -eq '1' ]]; then
echo 'installed: /var/log/v2ray/' echo 'installed: /var/log/v2ray/'