Browse Source

Update wireguard.sh

Teddysun 6 years ago
parent
commit
d9f6fab4ea
1 changed files with 3 additions and 3 deletions
  1. 3 3
      wireguard.sh

+ 3 - 3
wireguard.sh

@@ -339,9 +339,9 @@ enable_ip_forward() {
 set_firewall() {
     _info "Setting firewall rules"
     if _exists "firewall-cmd"; then
-        if [ "$(firewall-cmd --state)" = "running" ]; then
+        if [ "$(firewall-cmd --state | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g")" = "running" ]; then
             default_zone="$(firewall-cmd --get-default-zone)"
-            if [ "$(firewall-cmd --zone=${default_zone} --query-masquerade)" = "no" ]; then
+            if [ "$(firewall-cmd --zone=${default_zone} --query-masquerade | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g")" = "no" ]; then
                 _error_detect "firewall-cmd --zone=${default_zone} --add-masquerade"
             fi
             if ! firewall-cmd --list-ports | grep -qw "${SERVER_WG_PORT}/udp"; then
@@ -648,4 +648,4 @@ main() {
     esac
 }
 
-main "$@"
+main "$@"