Update print|show signature; code cleanup

taers232c · Jun 21, 2021 · 676a967 · 676a967
1 parent dcd160e
commit 676a967
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 114 deletions.
diff --git a/src/GamCommands.txt b/src/GamCommands.txt
@@ -5440,9 +5440,19 @@ gam <UserTypeEntity> update sendas <EmailAddress> [name <String>]
 gam <UserTypeEntity> delete sendas <EmailAddressEntity>
 gam <UserTypeEntity> info sendas <EmailAddressEntity> [compact|format|html]
 gam <UserTypeEntity> show sendas [compact|format|html]
-        [primary] [default] [verifyonly]
+        [primary|default] [verifyonly]
 gam <UserTypeEntity> print sendas [compact]
-        [primary] [default] [verifyonly] [todrive <ToDriveAttribute>*]
+        [primary|default] [verifyonly] [todrive <ToDriveAttribute>*]
+
+gam <UserTypeEntity> signature|sig
+        <String>|(htmlsig <String>)|(file|htmlfile <FileName> [charset <Charset>])|(gdoc|ghtml <UserGoogleDoc>)
+        (replace <Tag> <UserReplacement>)*
+        [html [<Boolean>]] [name <String>] [replyto <EmailAddress>]
+        [default] [primary] [treatasalias <Boolean>]
+gam <UserTypeEntity> show signature|sig [compact|format|html]
+        [primary|default] [verifyonly]
+gam <UserTypeEntity> print signature [compact]
+        [primary|default] [verifyonly] [todrive <ToDriveAttribute>*]
 
 gam <UserTypeEntity> create|add smime file <FileName> [password <Password>]
         [sendas|sendasemail <EmailAddress>] [default]
@@ -5455,16 +5465,6 @@ gam <UserTypeEntity> show smimes
 gam <UserTypeEntity> print smimes [todrive <ToDriveAttribute>*]
         [primary|default|(sendas|sendasemail <EmailAddress>)]
 
-gam <UserTypeEntity> signature|sig
-        <String>|(htmlsig <String>)|(file|htmlfile <FileName> [charset <Charset>])|(gdoc|ghtml <UserGoogleDoc>)
-        (replace <Tag> <UserReplacement>)*
-        [html [<Boolean>]] [name <String>] [replyto <EmailAddress>]
-        [default] [primary] [treatasalias <Boolean>]
-gam <UserTypeEntity> show signature|sig [compact|format|html]
-        [primary] [default] [verifyonly]
-gam <UserTypeEntity> print signature [compact]
-        [primary] [default] [verifyonly] [todrive <ToDriveAttribute>*]
-
 gam <UserTypeEntity> vacation <Boolean> subject <String>
         [message|htmlmessage <String>|(file|htmlfile <FileName> [charset <CharSet>])|(gdoc|ghtml <UserGoogleDoc>)]
         (replace <Tag> <UserReplacement>)*

diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
@@ -6,23 +6,29 @@ always treated a mismatch; now a blank field will be interpreted as `False` for
 and `0` for `<Number>` and the match test will be performed.
 
 Added options `primary` and `default`` to the following commands
-so that only the primary and/or default signature/sendas is displayed
-rather than all signatures/sendas.
-
-Added option `verifyonly` to the following commands; it causes a Boolean
-to be displayed in the `signature` field rather that the signature text;
-this simplifies checking for users with undefined signatures.
+so that only the primary or default sendas is displayed
+for each user in `<UserTypeEntity>` rather than all sendas.
 ```
 gam <UserTypeEntity> show sendas [compact|format|html]
         [primary] [default] [verifyonly]
 gam <UserTypeEntity> print sendas [compact]
         [primary] [default] [verifyonly] [todrive <ToDriveAttribute>*]
-gam <UserTypeEntity> show signature|sig [compact|format|html]
+```
+
+Added options `primary` and `default`` to the following commands
+so that the primary or default signature is displayed
+for each user in `<UserTypeEntity>` rather than the current signature.
+```
+gam <UserTypeEntity> show signature [compact|format|html]
         [primary] [default] [verifyonly]
 gam <UserTypeEntity> print signature [compact]
         [primary] [default] [verifyonly] [todrive <ToDriveAttribute>*]
 ```
 
+Added option `verifyonly` to the commands show above; it causes a Boolean
+to be displayed in the `signature` field rather that the signature text;
+this simplifies checking for users with undefined signatures.
+
 For example, this command will display a list of users without a primary email address signature (wrapped for readability):
 ```
 gam config csv_output_row_filter "signature:boolean:false" csv_output_header_filter "User,displayName,signature"