Merge c5175ee474
into 696439f1ae
This commit is contained in:
commit
e8aee00c19
@ -108,7 +108,7 @@ function _createProfile(opts, cb) {
|
||||
} else {
|
||||
defaults.url = 'https://us-sw-1.api.joyent.com';
|
||||
|
||||
var possibleDefaultFp = '~/.ssh/id_rsa';
|
||||
var possibleDefaultFp = '~/.ssh/id_rsa.pub';
|
||||
if (fs.existsSync(common.tildeSync(possibleDefaultFp))) {
|
||||
defaults.keyId = possibleDefaultFp;
|
||||
}
|
||||
@ -151,15 +151,15 @@ function _createProfile(opts, cb) {
|
||||
'Must be at least 3 characters'));
|
||||
}
|
||||
if (!regex.test(value)) {
|
||||
return valCb(new Error('Must not container a "\\"'));
|
||||
return valCb(new Error('Must not contain a "\\"'));
|
||||
}
|
||||
valCb();
|
||||
}
|
||||
}, {
|
||||
desc: 'The fingerprint of the SSH key you have registered ' +
|
||||
'for your account. Alternatively, You may enter a local ' +
|
||||
'path to a public or private SSH key to have the ' +
|
||||
'fingerprint calculated for you.',
|
||||
'for your account (ssh-keygen -l -Emd5). Alternatively, you ' +
|
||||
'may enter a local path to a public or non-passphrase protected' +
|
||||
'private SSH key to have the fingerprint calculated for you.',
|
||||
default: defaults.keyId,
|
||||
key: 'keyId',
|
||||
validate: function validateKeyId(value, valCb) {
|
||||
|
Reference in New Issue
Block a user