tapsetup: fix output for no sub-interfaces with list command

To be correct YAML, an empty list must be signified as a `[]`
This commit is contained in:
Martine Lenders 2020-09-25 12:21:58 +02:00
parent ad9e35c445
commit ff8b7a92d4
No known key found for this signature in database
GPG Key ID: CCD317364F63286F

View File

@ -312,21 +312,31 @@ get_master() {
list_bridge() { list_bridge() {
BRIDGE=$1 BRIDGE=$1
echo "$BRIDGE:" IFACES=0
echo -n "$BRIDGE:"
case "${PLATFORM}" in case "${PLATFORM}" in
Linux) Linux)
for IF in $(ls /sys/class/net/${BRIDGE}/brif); do for IF in $(ls /sys/class/net/${BRIDGE}/brif 2> /dev/null); do
echo "- $IF" echo ""
echo -n "- $IF"
IFACES=$(( ${IFACES} + 1 ))
done done
;; ;;
FreeBSD|OSX) FreeBSD|OSX)
for IF in $(ifconfig ${BRIDGE} | grep -oiE "member: .+ " | cut -d' ' -f2); do for IF in $(ifconfig ${BRIDGE} | grep -oiE "member: .+ " | cut -d' ' -f2); do
echo "- $IF" echo ""
echo -n "- $IF"
IFACES=$(( ${IFACES} + 1 ))
done done
;; ;;
*) *)
;; ;;
esac esac
if [ "${IFACES}" -eq 0 ]; then
echo " []"
else
echo ""
fi
} }
while true ; do while true ; do