diff --git a/ChangeLog b/ChangeLog index b575453f..27083acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -183,6 +183,9 @@ thru keys panel (F8). * Fixed bug with minified styles. +* If git not installed do not show error. +Just propose install git and clone from github repo. + 2012.10.01, Version 0.1.7 diff --git a/cloudcmd.js b/cloudcmd.js index 9f6f4ad3..2dc1851f 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -1,6 +1,6 @@ (function(){ "use strict"; - + var DIR = __dirname + '/', main = require(DIR + 'lib/server/main'), diff --git a/lib/server/update.js b/lib/server/update.js index a1208d08..7a2e23af 100644 --- a/lib/server/update.js +++ b/lib/server/update.js @@ -6,6 +6,7 @@ var main = global.cloudcmd.main, mainpackage = main.mainpackage, exec = main.child_process.exec, + Util = main.util, DIR = main.DIR; exports.get = function(){ @@ -25,7 +26,8 @@ * @param pStdout * @param pStderr */ - function pull(pError, pStdout, pStderr){ + function pull(pError, pStdout, pStderr){ + var lExec; if(!pError){ pStderr = ''; @@ -37,13 +39,17 @@ console.log(DIR); if(mainpackage) pStdout = 'Version ' + mainpackage.version + '\n' + pStdout; - } + + lExec = { + stdout : pStdout, + stderr : pStderr || pError + }; + }else + lExec = 'install git to get auto updates (works for cloned versinons)\n' + + 'git clone http://github.com/coderaiser/cloudcmd'; - var lExec = { - stdout : pStdout, - stderr : pStderr || pError - }; - console.log(lExec); + + Util.log(lExec); } })(); diff --git a/test/test.sh b/test/test.sh index 44d1ac51..8a20d346 100755 --- a/test/test.sh +++ b/test/test.sh @@ -3,7 +3,7 @@ npm i recess jshint echo "jshint server.js client.js cloudcmd.js" node_modules/jshint/bin/hint --config test/.jshintrc lib/server.js lib/client.js cloudcmd.js echo "jshint lib/cloudfunc.js lib/client/keyBinding.js" -node_modules/jshint/bin/hint --config test/.jshintrc lib/util.js lib/cloudfunc.js node_modules/minify/minify.js lib/client/keyBinding.js +node_modules/jshint/bin/hint --config test/.jshintrc lib/util.js lib/cloudfunc.js lib/client/keyBinding.js echo "lib/client/dom.js lib/client/ie.js lib/client/menu.js lib/client/socket.js ./lib/client/terminal.js lib/client/viewer.js lib/client/storage/_github.js lib/client/menu.js lib/client/editor/_codemirror.js" node_modules/jshint/bin/hint --config test/.jshintrc lib/client/dom.js lib/client/ie.js lib/client/menu.js lib/client/socket.js ./lib/client/terminal.js lib/client/viewer.js lib/client/storage/_github.js lib/client/menu.js lib/client/editor/_codemirror.js echo "jshint ./package.json ./config.json" @@ -12,5 +12,4 @@ node_modules/jshint/bin/hint --config test/.jshintrc ./package.json ./config.jso echo "recess css/*.css" ./node_modules/recess/bin/recess css/*.css node test/test.js -npm r recess jshint node cloudcmd.js test \ No newline at end of file