diff --git a/src/klish-plugin-infix/xml/containers.xml b/src/klish-plugin-infix/xml/containers.xml index af8bd610..45ffcbb2 100644 --- a/src/klish-plugin-infix/xml/containers.xml +++ b/src/klish-plugin-infix/xml/containers.xml @@ -177,34 +177,48 @@ - doas container show + + doas container show |pager + doas container -a show - doas -u $USER cat /log/container + + doas -u $USER cat /log/container |pager + doas container show images - doas container -a show images + + doas container -a show images |pager + - doas container list oci + + doas container list oci |pager + - doas container stat + + doas container stat + - doas podman system df -v + + doas podman system df -v + - doas container show volumes + + doas container show volumes |pager + diff --git a/src/klish-plugin-infix/xml/infix.xml b/src/klish-plugin-infix/xml/infix.xml index abbb6cb2..f687bc12 100644 --- a/src/klish-plugin-infix/xml/infix.xml +++ b/src/klish-plugin-infix/xml/infix.xml @@ -133,11 +133,11 @@ upgrade - + topic=${KLISH_PARAM_topic:-quick} fn="/usr/share/infix/cli/${topic}.md" if [ -f "$fn" ]; then - lowdown -t term --term-vmargin=1 "$fn" + lowdown -t term --term-vmargin=1 "$fn" |pager else echo "Help topic not available, try help without an argument, or tap '?' for a list." fi @@ -226,27 +226,36 @@ - bridge -color link + + bridge -color link |pager + - bridge -color fdb + + bridge -color fdb |pager + - bridge -color -d mdb + + bridge -color -d mdb |pager + - sysrepocfg -d operational -X -f json -x /ietf-interfaces:interfaces | \ - /usr/libexec/statd/cli-pretty show-bridge-mdb + + sysrepocfg -d operational -X -f json -x /ietf-interfaces:interfaces | \ + /usr/libexec/statd/cli-pretty show-bridge-mdb |pager bridge -color vlan - bridge -color -d vlan + + bridge -color -d vlan |pager + @@ -264,7 +273,9 @@ - cat /etc/resolv.conf.head 2>/dev/null; resolvconf -l | sed 's/#.*//; /^\s*$/d' + + cat /etc/resolv.conf.head 2>/dev/null; resolvconf -l | sed 's/#.*//; /^\s*$/d' |pager + @@ -306,19 +317,19 @@ bfd - + if [ -z "$KLISH_PARAM_name" ]; then - doas vtysh -c "show ip ospf" + doas vtysh -c "show ip ospf" |pager elif [ "$KLISH_PARAM_name" == "neighbor" ];then - doas vtysh -c "show ip ospf neighbor" + doas vtysh -c "show ip ospf neighbor" |pager elif [ "$KLISH_PARAM_name" == "interfaces" ];then - doas vtysh -c "show ip ospf interface" + doas vtysh -c "show ip ospf interface" |pager elif [ "$KLISH_PARAM_name" == "routes" ];then - doas vtysh -c "show ip ospf route" + doas vtysh -c "show ip ospf route" |pager elif [ "$KLISH_PARAM_name" == "database" ];then - doas vtysh -c "show ip ospf database" + doas vtysh -c "show ip ospf database" |pager elif [ "$KLISH_PARAM_name" == "bfd" ];then - doas vtysh -c "show bfd peers" + doas vtysh -c "show bfd peers" |pager fi @@ -330,7 +341,7 @@ ipv6 - + case $KLISH_PARAM_ip in ipv4) KLISH_PARAM_ip=ip @@ -339,14 +350,14 @@ KLISH_PARAM_ip=ipv6 ;; esac - show -p $KLISH_PARAM_ip route + show -p $KLISH_PARAM_ip route |pager - + sysrepocfg -f json -X -d operational -x "/ietf-hardware:hardware" | \ - /usr/libexec/statd/cli-pretty "show-hardware" + /usr/libexec/statd/cli-pretty "show-hardware" |pager @@ -358,46 +369,60 @@ - + if [ -n "$KLISH_PARAM_name" ]; then sysrepocfg -f json -X -d operational -x \ "/ietf-interfaces:interfaces/interface[name=\"$KLISH_PARAM_name\"]" | \ - /usr/libexec/statd/cli-pretty "show-interfaces" -n "$KLISH_PARAM_name" + /usr/libexec/statd/cli-pretty "show-interfaces" -n "$KLISH_PARAM_name" |pager else sysrepocfg -f json -X -d operational -m ietf-interfaces | \ - /usr/libexec/statd/cli-pretty "show-interfaces" + /usr/libexec/statd/cli-pretty "show-interfaces" |pager fi - ip -color addr + + ip -color addr |pager + - ip -color -br addr | sort -V | sed 's/@dsa[0-9]/ /' + + ip -color -br addr | sort -V | sed 's/@dsa[0-9]/ /' |pager + - ip -color -d addr + + ip -color -d addr |pager + - mctl + + mctl |pager + - show -p ip route + + show -p ip route |pager + - ip -color -6 addr + + ip -color -6 addr |pager + - show -p ipv6 route + + show -p ipv6 route |pager + @@ -409,7 +434,7 @@ - + file=/log/${KLISH_PARAM_fn:-syslog} case "$file" in *.gz) @@ -422,7 +447,7 @@ if [ -n "$KLISH_PARAM_lines" ]; then $cmd "$file" | tail -n $KLISH_PARAM_lines else - $cmd "$file" + $cmd "$file" | pager fi @@ -436,24 +461,26 @@ --> - cat /etc/version + cat /etc/version - jq -C . /etc/factory-config.cfg + jq -C . /etc/factory-config.cfg |pager - sysrepocfg -X -f json | jq -C . + sysrepocfg -X -f json | jq -C . |pager - jq -C . /cfg/startup-config.cfg + jq -C . /cfg/startup-config.cfg |pager - /bin/yorn "This will restore the device to factory defaults" - /ietf-factory-default:factory-reset + + /bin/yorn "This will restore the device to factory defaults" + + /ietf-factory-default:factory-reset @@ -469,7 +496,7 @@ - + if [ -n "$KLISH_PARAM_split" ]; then if echo $KLISH_PARAM_addrlen |grep -q ':'; then split="-S $KLISH_PARAM_split"