From feaf8c792b0f94f40a8ad09c89d7f25ce2e0a53b Mon Sep 17 00:00:00 2001
From: tschettervictor <tschetter.victor@gmail.com>
Date: Tue, 29 Apr 2025 20:48:11 -0600
Subject: [PATCH] print blank line after last jail

---
 usr/local/share/bastille/cmd.sh      |  5 +++++
 usr/local/share/bastille/common.sh   |  1 +
 usr/local/share/bastille/console.sh  |  4 ++++
 usr/local/share/bastille/cp.sh       |  4 ++++
 usr/local/share/bastille/destroy.sh  |  5 +++++
 usr/local/share/bastille/jcp.sh      |  5 +++++
 usr/local/share/bastille/limits.sh   |  5 +++++
 usr/local/share/bastille/mount.sh    |  5 +++++
 usr/local/share/bastille/pkg.sh      |  5 +++++
 usr/local/share/bastille/service.sh  |  4 ++++
 usr/local/share/bastille/start.sh    |  4 ++++
 usr/local/share/bastille/stop.sh     |  4 ++++
 usr/local/share/bastille/sysrc.sh    |  4 ++++
 usr/local/share/bastille/tags.sh     |  5 +++++
 usr/local/share/bastille/template.sh |  7 ++++++-
 usr/local/share/bastille/umount.sh   |  4 ++++
 usr/local/share/bastille/zfs.sh      | 22 +++++++++++++++++++++-
 17 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/usr/local/share/bastille/cmd.sh b/usr/local/share/bastille/cmd.sh
index 3d21f52e..c48e848c 100644
--- a/usr/local/share/bastille/cmd.sh
+++ b/usr/local/share/bastille/cmd.sh
@@ -116,6 +116,11 @@ for _jail in ${JAILS}; do
     else 
         RETURN=$(($RETURN+$ERROR_CODE))
     fi
+	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+
 done
 
 # Check when a command is executed in all running jails. (bastille cmd ALL ...)
diff --git a/usr/local/share/bastille/common.sh b/usr/local/share/bastille/common.sh
index a5430a5a..5b53a2d6 100644
--- a/usr/local/share/bastille/common.sh
+++ b/usr/local/share/bastille/common.sh
@@ -67,6 +67,7 @@ fi
 # Notify message on error, and continue to next jail
 error_continue() {
     error_notify "$@"
+    echo ""
     # shellcheck disable=SC2104
     continue
 }
diff --git a/usr/local/share/bastille/console.sh b/usr/local/share/bastille/console.sh
index 8539ec63..d3a98e21 100644
--- a/usr/local/share/bastille/console.sh
+++ b/usr/local/share/bastille/console.sh
@@ -133,5 +133,9 @@ for _jail in ${JAILS}; do
         LOGIN="$(jexec -l "${_jail}" which login)"
         ${_setfib} jexec -l "${_jail}" $LOGIN -f root
     fi
+	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
     
 done
diff --git a/usr/local/share/bastille/cp.sh b/usr/local/share/bastille/cp.sh
index 41771ed6..40dabca3 100644
--- a/usr/local/share/bastille/cp.sh
+++ b/usr/local/share/bastille/cp.sh
@@ -98,4 +98,8 @@ for _jail in ${JAILS}; do
         error_continue "CP failed: ${host_path} -> ${jail_path}"
     fi
 	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
\ No newline at end of file
diff --git a/usr/local/share/bastille/destroy.sh b/usr/local/share/bastille/destroy.sh
index 06392a7e..23d5f2ac 100644
--- a/usr/local/share/bastille/destroy.sh
+++ b/usr/local/share/bastille/destroy.sh
@@ -110,6 +110,11 @@ destroy_jail() {
                 pfctl -a "rdr/${_jail}" -Fn
             fi
         fi
+		
+        # Print blank line on last jail
+        _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+        [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
     done
 }
 
diff --git a/usr/local/share/bastille/jcp.sh b/usr/local/share/bastille/jcp.sh
index bb10434b..ba4b060a 100644
--- a/usr/local/share/bastille/jcp.sh
+++ b/usr/local/share/bastille/jcp.sh
@@ -103,5 +103,10 @@ for _jail in ${DEST_TARGET}; do
         if ! cp "${OPTION}" "${source_path}" "${dest_path}"; then
             error_continue "JCP failed: ${source_path} -> ${dest_path}"
         fi
+		
+		# Print blank line on last jail
+        _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+        [ "${_jail}" = "${_last_jail}" ] && echo ""
+		
     fi
 done
\ No newline at end of file
diff --git a/usr/local/share/bastille/limits.sh b/usr/local/share/bastille/limits.sh
index 7c1e0123..64820bdc 100644
--- a/usr/local/share/bastille/limits.sh
+++ b/usr/local/share/bastille/limits.sh
@@ -188,4 +188,9 @@ for _jail in ${JAILS}; do
             fi
             ;;
     esac
+	
+	# Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
diff --git a/usr/local/share/bastille/mount.sh b/usr/local/share/bastille/mount.sh
index 1352a776..26034725 100644
--- a/usr/local/share/bastille/mount.sh
+++ b/usr/local/share/bastille/mount.sh
@@ -198,4 +198,9 @@ for _jail in ${JAILS}; do
     echo "${_fstab_entry}" >> "${bastille_jailsdir}/${_jail}/fstab" || error_continue "Failed to create fstab entry: ${_fstab_entry}"
     mount -F "${bastille_jailsdir}/${_jail}/fstab" -a || error_continue "Failed to mount volume: ${_fullpath}"
     echo "Added: ${_fstab_entry}"
+	
+	# Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
diff --git a/usr/local/share/bastille/pkg.sh b/usr/local/share/bastille/pkg.sh
index f95ac81f..bbce79a6 100644
--- a/usr/local/share/bastille/pkg.sh
+++ b/usr/local/share/bastille/pkg.sh
@@ -124,6 +124,11 @@ for _jail in ${JAILS}; do
             errors=1
         fi
     fi
+	
+	# Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
 
 if [ $errors -ne 0 ]; then
diff --git a/usr/local/share/bastille/service.sh b/usr/local/share/bastille/service.sh
index 4c58a0db..3ca6e63a 100644
--- a/usr/local/share/bastille/service.sh
+++ b/usr/local/share/bastille/service.sh
@@ -99,4 +99,8 @@ for _jail in ${JAILS}; do
 	
     jexec -l "${_jail}" /usr/sbin/service "$@"
 	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
diff --git a/usr/local/share/bastille/start.sh b/usr/local/share/bastille/start.sh
index ba2d7738..5204e057 100644
--- a/usr/local/share/bastille/start.sh
+++ b/usr/local/share/bastille/start.sh
@@ -187,5 +187,9 @@ for _jail in ${JAILS}; do
 
     # Delay between jail action
     sleep "${DELAY_TIME}"
+	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
 
 done
diff --git a/usr/local/share/bastille/stop.sh b/usr/local/share/bastille/stop.sh
index 0d82c7f5..3e8bce75 100644
--- a/usr/local/share/bastille/stop.sh
+++ b/usr/local/share/bastille/stop.sh
@@ -133,5 +133,9 @@ for _jail in ${JAILS}; do
             pfctl -q -t "${bastille_network_pf_table}" -T delete "${_ip}" 
         done
     fi
+	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
 
 done
diff --git a/usr/local/share/bastille/sysrc.sh b/usr/local/share/bastille/sysrc.sh
index b1e388d1..a34feca9 100644
--- a/usr/local/share/bastille/sysrc.sh
+++ b/usr/local/share/bastille/sysrc.sh
@@ -99,4 +99,8 @@ for _jail in ${JAILS}; do
 	
     jexec -l "${_jail}" /usr/sbin/sysrc "$@"
 	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
diff --git a/usr/local/share/bastille/tags.sh b/usr/local/share/bastille/tags.sh
index 44258671..81e8f77d 100644
--- a/usr/local/share/bastille/tags.sh
+++ b/usr/local/share/bastille/tags.sh
@@ -118,5 +118,10 @@ for _jail in ${JAILS}; do
         usage
         ;;
     esac
+	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
 
diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh
index f3b988c9..14409733 100644
--- a/usr/local/share/bastille/template.sh
+++ b/usr/local/share/bastille/template.sh
@@ -469,6 +469,11 @@ for _jail in ${JAILS}; do
             echo
         fi
     done
+	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+    
+	info "Template applied: ${TEMPLATE}"
 
-    info "Template applied: ${TEMPLATE}"
 done
diff --git a/usr/local/share/bastille/umount.sh b/usr/local/share/bastille/umount.sh
index 8e9c604b..c8395ed8 100644
--- a/usr/local/share/bastille/umount.sh
+++ b/usr/local/share/bastille/umount.sh
@@ -126,4 +126,8 @@ for _jail in ${JAILS}; do
     
     echo "Unmounted: ${_jailpath}"
 	
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
diff --git a/usr/local/share/bastille/zfs.sh b/usr/local/share/bastille/zfs.sh
index d3df3533..70209928 100644
--- a/usr/local/share/bastille/zfs.sh
+++ b/usr/local/share/bastille/zfs.sh
@@ -52,6 +52,10 @@ for _jail in ${JAILS}; do
     # shellcheck disable=SC2140
     zfs snapshot -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
 
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
 }
 
@@ -64,6 +68,10 @@ for _jail in ${JAILS}; do
     # shellcheck disable=SC2140
     zfs destroy -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
 
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
 }
 
@@ -75,6 +83,10 @@ for _jail in ${JAILS}; do
 	
     zfs "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
 
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
 }
 
@@ -85,6 +97,10 @@ for _jail in ${JAILS}; do
     info "[${_jail}]:"
     zfs get "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
 
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+	
 done
 }
 
@@ -95,7 +111,11 @@ for _jail in ${JAILS}; do
     info "[${_jail}]:"
 	
     zfs list -t all -o name,used,avail,refer,mountpoint,compress,ratio -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
-	
+
+    # Print blank line on last jail
+    _last_jail="$(echo ${JAILS} | awk '{print $NF}')"
+    [ "${_jail}" = "${_last_jail}" ] && echo ""
+		
 done
 }