Release v0.9.2

Author: rweigel

hapi-server

@@ -8,7 +8,7 @@ if type $path"/bin/node" &> /dev/null; then
 elif type node &> /dev/null; then
 	node $path"/server.js" $@	
 elif type nodejs &> /dev/null; then
-	node $path"/server.js" $@
+	nodejs $path"/server.js" $@
 else
 	echo "Did not find "$(dirname "$SCRIPT")"/bin/node, node, or nodejs"
 fi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hapi-server",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "license": "MIT",
   "engine-strict": true,
   "engines": {
@@ -29,7 +29,7 @@
     "clean": "rm -rf node_modules/; rm -rf public/data/QinDenton/",
     "test": "node test/test.js",
     "start": "node server.js --port 8999",
-    "release": "rm -rf node_modules; npm install --production; source pkg/GITHUB_TOKEN && release-it $npm_package_version --preRelease=beta --no-git.requireCleanWorkingDir"
+    "release": "cd pkg; make release VERSION=v$npm_package_version"
   },
   "bin": "server.js",
   "release-it": {

pkg/Makefile

@@ -7,6 +7,11 @@ DIST=darwin-x64
 #DIST=linux-armv7l # Did this on Pi 3+
 #DIST=win-x64
 
+release:
+	cd ..; rm -rf node_modules; npm install --production; 
+	make update VERSION=$(VERSION);
+	cd ..; source pkg/GITHUB_TOKEN && release-it $(VERSION) --preRelease=beta --no-git.requireCleanWorkingDir --no-npm.publish
+
 # When node and python binaries do not need to be updated.
 update:
 	make package OS=darwin-x64
@@ -81,14 +86,12 @@ files:
 		--exclude pkg \
 		--exclude .git \
 		--exclude public/data/QinDenton \
-		../ dist/hapi-server-$(VERSION)/
-	cd dist/hapi-server-$(VERSION); \
-		rm -f *.md \
-		rm -f package* \
-		rm -rf .git* \
-		rm -rf node_modules/moment/src \
-		rm -rf node_modules/moment/min \ 
-		rm -rf node_modules/moment/locale \ 
+		../ dist/hapi-server-$(VERSION)
+	rm -f dist/hapi-server-$(VERSION)/*.md
+	rm -rf dist/hapi-server-$(VERSION)/.git*
+	rm -rf dist/hapi-server-$(VERSION)/node_modules/moment/src
+	rm -rf dist/hapi-server-$(VERSION)/node_modules/moment/min
+	rm -rf dist/hapi-server-$(VERSION)/node_modules/moment/locale
 
 clean:
 	rm -rf dist/

server.js

@@ -602,16 +602,15 @@ function data(req,res,catalog,header,include) {
 		}
 	});
 
-	child.stdout.on('end', function() {})
-
 	// TODO: Write this to log file
 	child.stderr.on('data', function (err) {
 		console.log(ds() + "Error message: " + clc.red(err.toString().trim()));
 	})
 
 	var writing = false;
 	var exited = false;
-	child.on('exit', function (code) {
+
+	child.on('close', function (code) {
 		exited = true;
 
 		if (code != 0) {
@@ -679,10 +678,10 @@ function data(req,res,catalog,header,include) {
 		}
 		if (header["format"] === "json") {
 			if (!convert) {
-				var writing = true;
+				//var writing = 	true;
 				res.write(buffer.toString());
-				var writing = false;
-				if (exited) {res.end();}
+				//var writing = false;
+				//if (exited) {res.end();}
 				return;			
 			} else {
 				// JSON requested and CL program cannot produce it.