From ff8b7a92d4410a88a6dea2f1acf860fba951dacb Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Fri, 25 Sep 2020 12:21:58 +0200 Subject: [PATCH] tapsetup: fix output for no sub-interfaces with list command To be correct YAML, an empty list must be signified as a `[]` --- dist/tools/tapsetup/tapsetup | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dist/tools/tapsetup/tapsetup b/dist/tools/tapsetup/tapsetup index 4e2e52e9b6..7ed8be9e5b 100755 --- a/dist/tools/tapsetup/tapsetup +++ b/dist/tools/tapsetup/tapsetup @@ -312,21 +312,31 @@ get_master() { list_bridge() { BRIDGE=$1 - echo "$BRIDGE:" + IFACES=0 + echo -n "$BRIDGE:" case "${PLATFORM}" in Linux) - for IF in $(ls /sys/class/net/${BRIDGE}/brif); do - echo "- $IF" + for IF in $(ls /sys/class/net/${BRIDGE}/brif 2> /dev/null); do + echo "" + echo -n "- $IF" + IFACES=$(( ${IFACES} + 1 )) done ;; FreeBSD|OSX) for IF in $(ifconfig ${BRIDGE} | grep -oiE "member: .+ " | cut -d' ' -f2); do - echo "- $IF" + echo "" + echo -n "- $IF" + IFACES=$(( ${IFACES} + 1 )) done ;; *) ;; esac + if [ "${IFACES}" -eq 0 ]; then + echo " []" + else + echo "" + fi } while true ; do