mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-01-23 18:55:26 +00:00
minor changes
This commit is contained in:
parent
86a1504cd9
commit
53e0858c3b
2 changed files with 31 additions and 7 deletions
|
|
@ -69,7 +69,10 @@ function writeLogsToFile(){
|
|||
})(process.stdout.write);
|
||||
}
|
||||
|
||||
/* function do safe require of needed module */
|
||||
/**
|
||||
* function do safe require of needed module
|
||||
* @param pModule
|
||||
*/
|
||||
function cloudRequire(pModule){
|
||||
try{
|
||||
return require(pModule);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
/* module update cloud commander */
|
||||
|
||||
var exec = require('child_process').exec;
|
||||
var exec = require('child_process').exec,
|
||||
packagejson = cloudRequire('package.json');
|
||||
|
||||
exports.get = function(){
|
||||
exec('git pull', pull);
|
||||
|
|
@ -13,14 +14,34 @@ exports.get = function(){
|
|||
* @param pStderr
|
||||
*/
|
||||
function pull(pError, pStdout, pStderr){
|
||||
if (pError !== null) {
|
||||
console.log('exec error: ' + pError);
|
||||
|
||||
if(!pError){
|
||||
if(pStdout !== 'Already up-to-date.\n'){
|
||||
pStdout = 'Cloud Commander updated. Restart to use new version.';
|
||||
}
|
||||
else pStdout = 'Cloud Commander is up to date';
|
||||
|
||||
if(packagejson)
|
||||
pStdout = 'Version ' + packagejson.version + '\n' + pStdout;
|
||||
}
|
||||
|
||||
|
||||
var lExec = {
|
||||
stdout : pStdout,
|
||||
stderr : pStderr || pError
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
console.log(lExec);
|
||||
}
|
||||
|
||||
/**
|
||||
* function do safe require of needed module
|
||||
* @param pModule
|
||||
*/
|
||||
function cloudRequire(pModule){
|
||||
try{
|
||||
return require(pModule);
|
||||
}
|
||||
catch(pError){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue