diff --git a/packages/cosmic-swingset/Dockerfile b/packages/cosmic-swingset/Dockerfile index 58f8a876b7c..eb268d57e10 100644 --- a/packages/cosmic-swingset/Dockerfile +++ b/packages/cosmic-swingset/Dockerfile @@ -9,6 +9,7 @@ RUN go mod download COPY Makefile* *.go ./ COPY app/ app/ +COPY bin/ bin/ COPY x/ x/ COPY cmd/ cmd/ COPY lib/*.go lib/ diff --git a/packages/cosmic-swingset/Makefile b/packages/cosmic-swingset/Makefile index 733b150c4e9..c33b9bfe0bd 100644 --- a/packages/cosmic-swingset/Makefile +++ b/packages/cosmic-swingset/Makefile @@ -65,7 +65,7 @@ scenario1-run-chain: scenario1-run-client: AG_SOLO_BASEDIR=t7 ve3/bin/ag-setup-solo --webhost=127.0.0.1:$(BASE_PORT) -AGC = ./lib/ag-chain-cosmos +AGC = ./bin/ag-chain-cosmos AGCH = ag-cosmos-helper scenario2-setup: all scenario2-setup-nobuild scenario2-setup-nobuild: @@ -173,7 +173,7 @@ compile-gyp: install: go.sum go install -v $(MOD_READONLY) $(BUILD_FLAGS) ./cmd/ag-cosmos-helper bindir="$${GOBIN-$${GOPATH-$$HOME/go}/bin}"; \ - ln -sf "$$PWD/lib/ag-chain-cosmos" "$$PWD/bin/ag-nchainz" "$$bindir/" + ln -sf "$$PWD/bin/ag-chain-cosmos" "$$PWD/bin/ag-nchainz" "$$bindir/" go.sum: go.mod @echo "--> Ensure dependencies have not been modified" diff --git a/packages/cosmic-swingset/bin/ag-chain-cosmos b/packages/cosmic-swingset/bin/ag-chain-cosmos new file mode 100755 index 00000000000..52e84678f87 --- /dev/null +++ b/packages/cosmic-swingset/bin/ag-chain-cosmos @@ -0,0 +1,13 @@ +#! /bin/bash +real0=$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}") +thisdir=$(cd "$(dirname -- "$real0")" && pwd -P) +nodeFlags=() +while test $# -gt 0; do + case "$1" in + --inspect*) nodeFlags+=( "$1" ) ;; + *) break ;; + esac + shift +done + +exec node ${nodeFlags[@]} "$thisdir/../lib/chain-entrypoint.js" ${1+"$@"} diff --git a/packages/cosmic-swingset/lib/ag-chain-cosmos b/packages/cosmic-swingset/lib/chain-entrypoint.js old mode 100755 new mode 100644 similarity index 100% rename from packages/cosmic-swingset/lib/ag-chain-cosmos rename to packages/cosmic-swingset/lib/chain-entrypoint.js