1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00

Merge pull request #249 from Ysurac/develop

Fix carrier return on FW types concatenation
This commit is contained in:
suyuan 2022-06-21 10:37:43 +08:00 committed by GitHub
commit c12eb5fa84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1161,7 +1161,7 @@ _set_vps_firewall() {
fw_list=$(_set_json "shorewalllist" "$settings")
[ -z "$fw_list" ] && return
if [ -n "$vpsfwlist" ]; then
vpsfwlist="$vpsfwlist\n$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
vpsfwlist="${vpsfwlist}"$'\n'"$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
else
vpsfwlist="$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
fi