Clean up nodemon, prebuild

jsguy · Jul 15, 2016 · c89a8d4 · c89a8d4
1 parent 5a2b496
commit c89a8d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.27",
   "private": false,
   "scripts": {
-    "development": "touch -t 197804100000.00 system/main.js && nodemon -e js,css,json --watch package.json --watch modules/ --watch system/ --watch cfg/ --watch mvc/ --watch client/ --watch server/ --watch app.js app.js",
-    "developmentforever": "touch -t 197804100000.00 system/main.js && nodemon --exitcrash -e js,css,json --watch package.json --watch modules/ --watch system/ --watch cfg/ --watch mvc/ --watch client/ --watch server/ --watch app.js app.js",
+    "development": "touch -t 197804100000.00 system/main.js && nodemon -e js,css,json --watch package.json --watch modules/ --watch system/ --ignore 'system/api/*/api.*.js' --ignore 'system/main.js' --watch cfg/ --watch mvc/ --ignore mvc/model/generated/ --watch client/ --watch server/ --watch app.js app.js",
+    "developmentforever": "touch -t 197804100000.00 system/main.js && nodemon --exitcrash -e js,css,json --watch package.json --watch modules/ --watch system/ --ignore 'system/api/*/api.*.js' --ignore 'system/main.js' --watch cfg/ --watch mvc/ --ignore mvc/model/generated/ --watch client/ --watch server/ --watch app.js app.js",
     "production": "touch -t 197804100000.00 system/main.js && node app.js",
     "cordova": "node app.js exitWhenReady"
   },

diff --git a/system/index.js b/system/index.js
@@ -472,11 +472,6 @@ module.exports = function(app, options) {
 		}
 	},
 	execExternalScript = function(script, callback){
-		//	Assume local directory if not full path
-		if(!(script.indexOf(".") == 0 || script.indexOf("/") == 0)) {
-			script = "./" + script;
-		}
-
 		//	Run the build step
 		exec(script, function (error, stdout, stderr) {
 			if(stdout) {
@@ -492,10 +487,9 @@ module.exports = function(app, options) {
 		});
 	};
 
-
-	//	TODO: Add buildfiles to serverconfig for bespoke items to prebuild...
+	//	If serverconfig has prebuild, these will be executed first
 	if(serverConfig.prebuild) {
-		async.mapSeries(serverConfig.prebuild, execExternalScript,function(){
+		async.mapSeries(serverConfig.prebuild, execExternalScript, function(){
 			runMiso();
 		});
 	} else {