Merge pull request #1366 from c-po/t1748-cli-help

vbash: beautify tab completion output/line breaks

4 files changed, 9 insertions, 28 deletions

diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 0747d649a..6e1592200 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -67,10 +67,7 @@
           </node>
           <leafNode name="global-parameters">
             <properties>
-              <help>Additional global parameters for DHCP server. You must
-                use the syntax of dhcpd.conf in this text-field. Using this
-                without proper knowledge may result in a crashed DHCP server.
-                Check system log to look for errors.</help>
+              <help>Additional global parameters for DHCP server. You must use the syntax of dhcpd.conf in this text-field. Using this without proper knowledge may result in a crashed DHCP server. Check system log to look for errors.</help>
               <multi/>
             </properties>
           </leafNode>
@@ -111,10 +108,7 @@
               #include <include/name-server-ipv4.xml.i>
               <leafNode name="shared-network-parameters">
                 <properties>
-                  <help>Additional shared-network parameters for DHCP server.
-                You must use the syntax of dhcpd.conf in this text-field.
-                Using this without proper knowledge may result in a crashed
-                DHCP server. Check system log to look for errors.</help>
+                  <help>Additional shared-network parameters for DHCP server. You must use the syntax of dhcpd.conf in this text-field. Using this without proper knowledge may result in a crashed DHCP server. Check system log to look for errors.</help>
                   <multi/>
                 </properties>
               </leafNode>
@@ -347,11 +341,7 @@
                       </leafNode>
                       <leafNode name="static-mapping-parameters">
                         <properties>
-                          <help>Additional static-mapping parameters for DHCP server.
-                Will be placed inside the "host" block of the mapping.
-                You must use the syntax of dhcpd.conf in this text-field.
-                Using this without proper knowledge may result in a crashed
-                DHCP server. Check system log to look for errors.</help>
+                          <help>Additional static-mapping parameters for DHCP server. Will be placed inside the "host" block of the mapping. You must use the syntax of dhcpd.conf in this text-field. Using this without proper knowledge may result in a crashed DHCP server. Check system log to look for errors.</help>
                           <multi/>
                         </properties>
                       </leafNode>
@@ -385,10 +375,7 @@
                   </tagNode >
                   <leafNode name="subnet-parameters">
                     <properties>
-                      <help>Additional subnet parameters for DHCP server. You must
-                use the syntax of dhcpd.conf in this text-field. Using this
-                without proper knowledge may result in a crashed DHCP server.
-                Check system log to look for errors.</help>
+                      <help>Additional subnet parameters for DHCP server. You must use the syntax of dhcpd.conf in this text-field. Using this without proper knowledge may result in a crashed DHCP server. Check system log to look for errors.</help>
                       <multi/>
                     </properties>
                   </leafNode>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index bfad6d70f..f1cbf8468 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -305,10 +305,7 @@
           </leafNode>
           <leafNode name="openvpn-option">
             <properties>
-              <help>Additional OpenVPN options. You must
-                use the syntax of openvpn.conf in this text-field. Using this
-                without proper knowledge may result in a crashed OpenVPN server.
-                Check system log to look for errors.</help>
+              <help>Additional OpenVPN options. You must use the syntax of openvpn.conf in this text-field. Using this without proper knowledge may result in a crashed OpenVPN server. Check system log to look for errors.</help>
               <multi/>
             </properties>
           </leafNode>
@@ -502,10 +499,7 @@
                   </leafNode>
                   <leafNode name="subnet-mask">
                     <properties>
-                      <help>Subnet mask pushed to dynamic clients.
-                If not set the server subnet mask will be used.
-                Only used with topology subnet or device type tap.
-                Not used with bridged interfaces.</help>
+                      <help>Subnet mask pushed to dynamic clients. If not set the server subnet mask will be used. Only used with topology subnet or device type tap. Not used with bridged interfaces.</help>
                       <constraint>
                         <validator name="ipv4-address"/>
                       </constraint>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index eb6107303..daee770a9 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -716,9 +716,7 @@
                   </leafNode>
                   <leafNode name="passphrase">
                     <properties>
-                      <help>WPA personal shared pass phrase. If you are
-                using special characters in the WPA passphrase then single
-                quotes are required.</help>
+                      <help>WPA personal shared pass phrase. If you are using special characters in the WPA passphrase then single quotes are required.</help>
                       <valueHelp>
                         <format>txt</format>
                         <description>Passphrase of at least 8 but not more than 63 printable characters</description>
diff --git a/scripts/build-command-templates b/scripts/build-command-templates
index 729fc864c..c8ae83d9d 100755
--- a/scripts/build-command-templates
+++ b/scripts/build-command-templates
@@ -27,6 +27,7 @@ import copy
 import functools
 
 from lxml import etree as ET
+from textwrap import fill
 
 # Defaults
 
@@ -130,6 +131,7 @@ def get_properties(p, default=None):
             # DNS forwarding for instance has multiple defaults - specified as whitespace separated list
             tmp = ', '.join(default.text.split())
             help += f' (default: {tmp})'
+        help = fill(help, width=64, subsequent_indent='\t\t\t')
         props["help"] = help
     except:
         pass