From 53e0858c3b0e2c56f09fa025158fa7adcafbdb2b Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Wed, 3 Oct 2012 05:33:01 -0400
Subject: [PATCH] minor changes

---
 cloudcmd.js          |  5 ++++-
 lib/server/update.js | 33 +++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/cloudcmd.js b/cloudcmd.js
index 453b1cac..9fdb6b50 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -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);
diff --git a/lib/server/update.js b/lib/server/update.js
index 8b30c799..5e69bb77 100644
--- a/lib/server/update.js
+++ b/lib/server/update.js
@@ -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;
+  }
 }
\ No newline at end of file