fix: use nodejs instead of sed for parsing package.json

Agoric · Dec 4, 2020 · f58df9c · f58df9c
1 parent 7c7379d
commit f58df9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/golang/cosmos/Makefile b/golang/cosmos/Makefile
@@ -1,5 +1,5 @@
-NAME := $(shell sed -ne 's/.*"name": "\([^"]*\)".*/\1/p' package.json)
-VERSION := $(shell sed -ne 's/.*"version": "\([^"]*\)".*/\1/p' package.json)
+NAME := $(shell node -e 'console.log(require("./package.json").name)')
+VERSION := $(shell node -e 'console.log(require("./package.json").version)')
 COMMIT = $(shell hash=`git rev-parse --short HEAD 2>/dev/null`; if test -n "$$hash"; then echo $$hash`git diff --quiet || echo -dirty`; else cat git-revision.txt; fi)
 
 default: all

diff --git a/packages/deployment/Makefile b/packages/deployment/Makefile
@@ -1,10 +1,16 @@
 REPOSITORY = agoric/cosmic-swingset
 REPOSITORY_SDK = agoric/agoric-sdk
 SS := ../cosmic-swingset/
-TAG := $(shell test ! -f ../../package.json || sed -ne 's/.*"version": "\(.*\)".*/\1/p' ../../package.json)
+VERSION := $(shell node -e 'console.log(require("../../package.json").version)' 2>/dev/null)
+
+TAG := $(if $(VERSION),$(VERSION),latest)
 
 # Don't push alpha tags as ":$(TAG)".
+ifeq ($(TAG),latest)
+DONT_PUSH_LATEST := :
+else
 DONT_PUSH_LATEST := $(if $(findstring -,$(TAG)),:,)
+endif
 
 docker-show-fat:
 	date > show-fat-bust-cache.stamp