ship.zone/npmci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some cosmetics

Browse Source
This commit is contained in:
Philipp Kunz
2016-06-26 02:17:17 +02:00
parent 94e7f502b3
commit 3653373f12
4 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ts/npmci.ssh.ts
View File

@ -8,7 +8,11 @@ export let ssh = () => {
let done = plugins.q.defer();
sshInstance = new plugins.smartssh.SshInstance();
plugins.smartparam.forEachMinimatch(process.env,"NPMCI_SSHKEY_*",evaluateSshEnv);
sshInstance.writeToDisk();
if(!process.env.NPMTS_TEST){
sshInstance.writeToDisk()
} else {
plugins.beautylog.log("In test mode, so not storing SSH keys to disk!");
};
done.resolve();
return done.promise;
};
@ -16,14 +20,23 @@ export let ssh = () => {
let evaluateSshEnv = (sshkeyEnvVarArg) => {
let resultArray = sshRegex.exec(sshkeyEnvVarArg);
let sshKey = new plugins.smartssh.SshKey();
if(notUndefined(resultArray[1])) sshKey.host = resultArray[1];
if(notUndefined(resultArray[2])) sshKey.privKeyBase64 = resultArray[2];
if(notUndefined(resultArray[3])) sshKey.pubKeyBase64 = resultArray[3];
plugins.beautylog.info("Found SSH identity for " + resultArray[1]);
if(notUndefined(resultArray[1])){
plugins.beautylog.log("---> host defined!")
sshKey.host = resultArray[1];
}
if(notUndefined(resultArray[2])){
plugins.beautylog.log("---> privKey defined!")
sshKey.privKeyBase64 = resultArray[2];
};
if(notUndefined(resultArray[3])){
"---> pubKey defined!"
sshKey.pubKeyBase64 = resultArray[3];
};
sshInstance.addKey(sshKey);
};
let notUndefined = (stringArg:string) => {
return (stringArg && stringArg != "undefined" && stringArg != "##")
return (stringArg && stringArg != "undefined" && stringArg != "##");
}