jsharmony-cms 1.5.4 → 1.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/models/_funcs.deploy.js +4 -2
- package/package.json +1 -1
package/models/_funcs.deploy.js
CHANGED
|
@@ -514,7 +514,10 @@ module.exports = exports = function(module, funcs){
|
|
|
514
514
|
var cms = module;
|
|
515
515
|
var git_path = cms.Config.git.bin_path || 'git';
|
|
516
516
|
return funcs.shellExec(git_path, repo_path, params, function(err, rslt, stderr){
|
|
517
|
-
if(err)
|
|
517
|
+
if(err){
|
|
518
|
+
if(err && (err.code == 'ENOENT')) err = new Error('Git executable not found. Please install git, or set the git.bin_path config parameter');
|
|
519
|
+
return cb(new Error('Git Error: ' + err.toString() + ' ' + (stderr||'')), rslt);
|
|
520
|
+
}
|
|
518
521
|
return cb(err, rslt);
|
|
519
522
|
}, exec_options);
|
|
520
523
|
}
|
|
@@ -2626,7 +2629,6 @@ module.exports = exports = function(module, funcs){
|
|
|
2626
2629
|
Bucket: bucket,
|
|
2627
2630
|
Key: page_bpath,
|
|
2628
2631
|
Body: fstream,
|
|
2629
|
-
ACL: 'public-read'
|
|
2630
2632
|
};
|
|
2631
2633
|
var contentType = HelperFS.getMimeType(page_bpath);
|
|
2632
2634
|
if(contentType) uploadParams.ContentType = contentType;
|