diff --git a/mintnet-kubernetes/app.template.yaml b/mintnet-kubernetes/app.template.yaml index fc3bbb9e..afdace34 100644 --- a/mintnet-kubernetes/app.template.yaml +++ b/mintnet-kubernetes/app.template.yaml @@ -124,7 +124,7 @@ spec: # fill genesis file with validators IFS=',' read -ra VALS_ARR <<< "$VALIDATORS" - fqdn_suffix=$(echo $(hostname -f) | sed 's#[^.]*\.\(\)#\1#') + fqdn_suffix=$(hostname -f | sed 's#[^.]*\.\(\)#\1#') for v in "${VALS_ARR[@]}"; do # wait until validator generates priv/pub key pair set +e @@ -140,7 +140,7 @@ spec: # add validator to genesis file along with its pub_key curl -s "http://$v.$fqdn_suffix/pub_key.json" | jq ". as \$k | {pub_key: \$k, amount: $VALIDATOR_POWER, name: \"$v\"}" > pub_validator.json - cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > /tendermint/genesis.json + cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/genesis.json rm pub_validator.json done diff --git a/mintnet-kubernetes/examples/basecoin/app.yaml b/mintnet-kubernetes/examples/basecoin/app.yaml index d1874a25..1a1f0ef8 100644 --- a/mintnet-kubernetes/examples/basecoin/app.yaml +++ b/mintnet-kubernetes/examples/basecoin/app.yaml @@ -172,7 +172,7 @@ spec: # fill genesis file with validators IFS=',' read -ra VALS_ARR <<< "$VALIDATORS" - fqdn_suffix=$(echo $(hostname -f) | sed 's#[^.]*\.\(\)#\1#') + fqdn_suffix=$(hostname -f | sed 's#[^.]*\.\(\)#\1#') for v in "${VALS_ARR[@]}"; do # wait until validator generates priv/pub key pair set +e @@ -188,7 +188,7 @@ spec: # add validator to genesis file along with its pub_key curl -s "http://$v.$fqdn_suffix/pub_key.json" | jq ". as \$k | {pub_key: \$k, amount: $VALIDATOR_POWER, name: \"$v\"}" > pub_validator.json - cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > /tendermint/genesis.json + cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/genesis.json rm pub_validator.json done @@ -222,11 +222,11 @@ spec: # replace "tm-N" with public keys in genesis file cp /etc/app/genesis.json genesis.json - fqdn_suffix=$(echo $(hostname -f) | sed 's#[^.]*\.\(\)#\1#') + fqdn_suffix=$(hostname -f | sed 's#[^.]*\.\(\)#\1#') # for every "base/account" i=3 length=$(cat genesis.json | jq ". | length") - while [ $i -lt $length ]; do + while [[ $i -lt $length ]]; do # extract pod name ("tm-0") pod=$(cat genesis.json | jq -r ".[$i].pub_key[0]") @@ -246,7 +246,7 @@ spec: curl -s "http://$pod.$fqdn_suffix/app_pub_key.json" | jq "." > k.json # replace pod name with it (["tm-0"] => "[1, XXXXXXXXXXXXXXXXXXXX]") - cat genesis.json | jq ".[$i].pub_key = $(cat k.json | jq '.')" > genesis.json + cat genesis.json | jq ".[$i].pub_key = $(cat k.json | jq '.')" > tmpgenesis && mv tmpgenesis genesis.json rm -f k.json i=$((i+2)) # skip "base/account" field itself diff --git a/mintnet-kubernetes/examples/counter/app.yaml b/mintnet-kubernetes/examples/counter/app.yaml index b4a06af0..f9f9ad19 100644 --- a/mintnet-kubernetes/examples/counter/app.yaml +++ b/mintnet-kubernetes/examples/counter/app.yaml @@ -116,7 +116,7 @@ spec: # fill genesis file with validators IFS=',' read -ra VALS_ARR <<< "$VALIDATORS" - fqdn_suffix=$(echo $(hostname -f) | sed 's#[^.]*\.\(\)#\1#') + fqdn_suffix=$(hostname -f | sed 's#[^.]*\.\(\)#\1#') for v in "${VALS_ARR[@]}"; do # wait until validator generates priv/pub key pair set +e @@ -132,7 +132,7 @@ spec: # add validator to genesis file along with its pub_key curl -s "http://$v.$fqdn_suffix/pub_key.json" | jq ". as \$k | {pub_key: \$k, amount: $VALIDATOR_POWER, name: \"$v\"}" > pub_validator.json - cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > /tendermint/genesis.json + cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/genesis.json rm pub_validator.json done diff --git a/mintnet-kubernetes/examples/dummy/app.yaml b/mintnet-kubernetes/examples/dummy/app.yaml index 7efc48dc..8d87910e 100644 --- a/mintnet-kubernetes/examples/dummy/app.yaml +++ b/mintnet-kubernetes/examples/dummy/app.yaml @@ -116,7 +116,7 @@ spec: # fill genesis file with validators IFS=',' read -ra VALS_ARR <<< "$VALIDATORS" - fqdn_suffix=$(echo $(hostname -f) | sed 's#[^.]*\.\(\)#\1#') + fqdn_suffix=$(hostname -f | sed 's#[^.]*\.\(\)#\1#') for v in "${VALS_ARR[@]}"; do # wait until validator generates priv/pub key pair set +e @@ -132,7 +132,7 @@ spec: # add validator to genesis file along with its pub_key curl -s "http://$v.$fqdn_suffix/pub_key.json" | jq ". as \$k | {pub_key: \$k, amount: $VALIDATOR_POWER, name: \"$v\"}" > pub_validator.json - cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > /tendermint/genesis.json + cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/genesis.json rm pub_validator.json done diff --git a/mintnet-kubernetes/examples/localchain/app.yaml b/mintnet-kubernetes/examples/localchain/app.yaml index 8d6a7775..980453e1 100644 --- a/mintnet-kubernetes/examples/localchain/app.yaml +++ b/mintnet-kubernetes/examples/localchain/app.yaml @@ -147,7 +147,7 @@ spec: # fill genesis file with validators IFS=',' read -ra VALS_ARR <<< "$VALIDATORS" - fqdn_suffix=$(echo $(hostname -f) | sed 's#[^.]*\.\(\)#\1#') + fqdn_suffix=$(hostname -f | sed 's#[^.]*\.\(\)#\1#') for v in "${VALS_ARR[@]}"; do # wait until validator generates priv/pub key pair set +e @@ -163,7 +163,7 @@ spec: # add validator to genesis file along with its pub_key curl -s "http://$v.$fqdn_suffix/pub_key.json" | jq ". as \$k | {pub_key: \$k, amount: $VALIDATOR_POWER, name: \"$v\"}" > pub_validator.json - cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > /tendermint/genesis.json + cat /tendermint/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/genesis.json rm pub_validator.json done