client: replace CAMLI_CLIENT_IDENTITY with CAMLI_KEYID

And remove all mentions of CAMLI_CLIENT_IDENTITY because there isn't any
need for the both of them.

http://camlistore.org/issue/412

Change-Id: I0d6b8cff0f23738231de98171a23550d82f05fe9

doc/environment-vars.txt

@@ -82,9 +82,10 @@ CAMLI_INCLUDE_PATH (string):
   /path/1:/path/two:/some/other/path, and Windows would be C:\path\one;D:\path\2
 
 CAMLI_KEYID (string):
-  devcam commands only, used by config/dev-server-config.json, and
-  config/dev-client-dir/client-config.json: public ID of the GPG key
-  to use for signing.
+  Optional GPG identity to use, taking precedence over config files.
+  Used by devcam commands, in config/dev-server-config.json, and
+  config/dev-client-dir/client-config.json as the public ID of the GPG
+  key to use for signing.
 
 CAMLI_KV_VERIFY (bool):
   Enable all the VerifyDb* options in cznic/kv, to e.g. track down
@@ -109,9 +110,6 @@ CAMLI_FAST_DEV (bool):
   Used by dev/demo.sh for giving presentations with devcam server/put/etc
   for faster pre-built builds, without calling make.go.
 
-CAMLI_CLIENT_IDENTITY (string):
-  Optional GPG identity to use, taking precedence over config files.
-
 CAMLI_SECRET_RING (string):
   Path to the GPG secret keyring, which is otherwise set by identitySecretRing
   in the server config, and secretRing in the client config.

pkg/client/config.go

@@ -358,7 +358,7 @@ func (c *Client) SignerPublicKeyBlobref() blob.Ref {
 }
 
 func (c *Client) initSignerPublicKeyBlobref() {
-	keyId := os.Getenv("CAMLI_CLIENT_IDENTITY")
+	keyId := os.Getenv("CAMLI_KEYID")
 	if keyId == "" {
 		configOnce.Do(parseConfig)
 		keyId = config.Identity

pkg/test/world.go

@@ -282,7 +282,7 @@ func MustRunCmd(t *testing.T, c *exec.Cmd) string {
 }
 
 // ClientIdentity returns the GPG identity to use in World tests, suitable
-// for setting in CAMLI_CLIENT_IDENTITY.
+// for setting in CAMLI_KEYID.
 func (w *World) ClientIdentity() string {
 	return "26F5ABDA"
 }