Typo

BastilleBSD · Dec 17, 2024 · 2b2abe0 · 2b2abe0
1 parent 990bf94
commit 2b2abe0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/usr/local/share/bastille/start.sh b/usr/local/share/bastille/start.sh
@@ -82,7 +82,7 @@ for _jail in ${JAILS}; do
         ips=$(bastille config "${_jail}" get ip4.addr)
         ips="${ips} $(bastille config "${_jail}" get ip6.addr)"
         for ip in ${ips}; do
-          ip=$(printf "$ip" | sed -E 's,/[0-9]+,,')
+          ip=${ip%%/*}
           if [ -n "${ip}" ]; then
             if ifconfig | grep -wF "${ip}" >/dev/null; then
               error_notify "Error: IP address (${ip}) already in use."

diff --git a/usr/local/share/bastille/stop.sh b/usr/local/share/bastille/stop.sh
@@ -74,7 +74,7 @@ for _jail in ${JAILS}; do
         jail -f "${bastille_jailsdir}/${_jail}/jail.conf" -r "${_jail}"
 
         ## remove (captured above) ipX.addr from firewall table
-        if [ -n "${bastille_network_loopback}" && ! -z "${ips}" ]; then
+        if [ -n "${bastille_network_loopback}" ] && [ ! -z "${ips}" ]; then
             if grep -qw "interface.*=.*${bastille_network_loopback}" "${bastille_jailsdir}/${_jail}/jail.conf"; then
                 for _ip in ${ips}; do
                     pfctl -q -t "${bastille_network_pf_table}" -T delete "${_ip}"