Просмотр исходного кода

[ipset] fix: incorrect parameter substitution medthod used for default values

Robert Zollner 5 лет назад
Родитель
Сommit
a5c8fd43e0
2 измененных файлов с 5 добавлено и 5 удалено
  1. 4 4
      bin/v-add-firewall-ipset
  2. 1 1
      bin/v-update-firewall-ipset

+ 4 - 4
bin/v-add-firewall-ipset

@@ -10,9 +10,9 @@
 
 
 ip_name=${1}
 ip_name=${1}
 data_source=${2}
 data_source=${2}
-ip_version=${3-v4}
-autoupdate=${4-yes}
-force=${5-no}
+ip_version=${3:-v4}
+autoupdate=${4:-yes}
+force=${5:-no}
 
 
 # Includes
 # Includes
 source $HESTIA/func/main.sh
 source $HESTIA/func/main.sh
@@ -124,7 +124,7 @@ fi
 inet_ver="inet"
 inet_ver="inet"
 [ "$ip_version" == "v6" ] && inet_ver="inet6"
 [ "$ip_version" == "v6" ] && inet_ver="inet6"
 
 
-$IPSET_BIN create "$ip_name" -exist hash:net family $inet_ver
+$IPSET_BIN -quiet create -exist "$ip_name" hash:net family $inet_ver
 $IPSET_BIN -quiet destroy "${ip_name}-tmp"
 $IPSET_BIN -quiet destroy "${ip_name}-tmp"
 $IPSET_BIN create "${ip_name}-tmp" -exist hash:net family $inet_ver maxelem 1048576
 $IPSET_BIN create "${ip_name}-tmp" -exist hash:net family $inet_ver maxelem 1048576
 $IPSET_BIN flush "${ip_name}-tmp"
 $IPSET_BIN flush "${ip_name}-tmp"

+ 1 - 1
bin/v-update-firewall-ipset

@@ -10,7 +10,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Force refresh
 # Force refresh
-force=${1-no}
+force=${1:-no}
 
 
 # Includes
 # Includes
 source $HESTIA/func/main.sh
 source $HESTIA/func/main.sh