merge

hapi-server · Sep 24, 2021 · 37bcada · 37bcada
1 parent 57e19d0
commit 37bcada
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,7 @@
 #   git commit -a -m "v1.0.0 Release"
 #   git push
 #   git checkout master
-# Then manually trigger build of deploy branch at
-# https://app.travis-ci.com/github/hapi-server/server-nodejs/ 
+# Manually bump version in package.json to next minor-beta, e.g., 1.0.1-beta.
 
 env:
   global:
@@ -155,7 +154,6 @@ jobs:
           - deploy
       script: hapi-server --test
 
-
 notifications:
   email:
     recipients:

diff --git a/README.md b/README.md
@@ -43,36 +43,42 @@ Installation and startup commands are given below the binary packages and docker
 OS-X x64:
 
 ```bash
- curl -L https://github.com/hapi-server/server-nodejs/releases/download/v1.0.8/hapi-server-v1.0.8-darwin-x64.tgz | tar zxf -
- cd hapi-server-v1.0.8
+ curl -L https://github.com/hapi-server/server-nodejs/releases/download/v1.0.9/hapi-server-v1.0.9-darwin-x64.tgz | tar zxf -
+ cd hapi-server-v1.0.9
  ./hapi-server --open
 ```
 
 Linux x64:
 
 ```bash
- curl -L https://github.com/hapi-server/server-nodejs/releases/download/v1.0.8/hapi-server-v1.0.8-linux-x64.tgz | tar zxf -
- cd hapi-server-v1.0.8
+ curl -L https://github.com/hapi-server/server-nodejs/releases/download/v1.0.9/hapi-server-v1.0.9-linux-x64.tgz | tar zxf -
+ cd hapi-server-v1.0.9
  ./hapi-server --open
 ```
 
 Linux ARMv7l:
 
 ```bash
- curl -L https://github.com/hapi-server/server-nodejs/releases/download/v1.0.8/hapi-server-v1.0.8-linux-armv7l.tgz | tar zxf -
- cd hapi-server-v1.0.8
+ curl -L https://github.com/hapi-server/server-nodejs/releases/download/v1.0.9/hapi-server-v1.0.9-linux-armv7l.tgz | tar zxf -
+ cd hapi-server-v1.0.9
  ./hapi-server --open
 ```
 
 Docker:
 
 ```
-docker pull rweigel/hapi-server:v1.0.8
-docker run -dit --name hapi-server-v1.0.8 --expose 8999 -p 8999:8999 rweigel/hapi-server:v1.0.8
-docker exec -it hapi-server-v1.0.8 ./hapi-server
+docker pull rweigel/hapi-server:v1.0.9
+docker run -dit --name hapi-server-v1.0.9 --expose 8999 -p 8999:8999 rweigel/hapi-server:v1.0.9
+docker exec -it hapi-server-v1.0.9 ./hapi-server
 # Open http://localhost:8999/TestData/hapi in a web browser
 ```
 
+npm:
+
+```
+npm install -g "@hapi-server/server"
+```
+
 <a name="Examples"></a>
 ## 2. Examples
 

diff --git a/hapi-server b/hapi-server
@@ -18,7 +18,7 @@ fi
 # Use node in path if version > versionmin
 if command -v node > /dev/null 2>&1; then
 	version=$(node -v)
-	versionf=${version//v/}
+	versionf=${version#v}
 	version="${versionf%%.*}"
     if test $version -gt $(($versionmin-1)); then
     	echo "hapi-server: Using system node binary with version = $versionf."
@@ -29,7 +29,7 @@ if command -v node > /dev/null 2>&1; then
     fi
 elif command -v nodejs > /dev/null 2>&1; then
 	version=$(node -v)
-	versionf=${version//v/}
+	versionf=${version#v}
 	version="${versionf%%.*}"
     if test $version -gt $(($versionmin-1)); then
     	echo "hapi-server: Using system nodejs binary with version = $versionf."

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hapi-server/server",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "license": "MIT",
   "engine-strict": true,
   "engines": {

diff --git a/pkg/Makefile b/pkg/Makefile
@@ -13,7 +13,7 @@ NODED=https://nodejs.org/dist/latest-v6.x
 # Do not modify following line. Version set by call to
 #   npm run version
 # which uses version in package.json
-VERSION=v1.0.8 # Do not modify
+VERSION=v1.0.9 # Do not modify
 
 # To get other OS-X versions, see
 # https://developer.apple.com/forums/thread/111322
@@ -127,6 +127,7 @@ docker-release-test:
 	docker pull rweigel/hapi-server:$(VERSION)
 	docker run -dit --name hapi-server-release-$(VERSION) --expose 8998 -p 8998:8998 rweigel/hapi-server:$(VERSION)
 	docker exec -it hapi-server-release-$(VERSION) ./hapi-server test
+	docker stop hapi-server-release-$(VERSION)
 
 test-packages:
 	make test-package VERSION=$(VERSION) OS=darwin-x64