diff --git a/asset-transfer-basic/chaincode-external/sampleBuilder/bin/detect b/asset-transfer-basic/chaincode-external/sampleBuilder/bin/detect index d6ed2edc..a124aa1f 100755 --- a/asset-transfer-basic/chaincode-external/sampleBuilder/bin/detect +++ b/asset-transfer-basic/chaincode-external/sampleBuilder/bin/detect @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/asset-transfer-basic/chaincode-external/sampleBuilder/bin/release b/asset-transfer-basic/chaincode-external/sampleBuilder/bin/release index cd3cd1b5..f2d078b4 100755 --- a/asset-transfer-basic/chaincode-external/sampleBuilder/bin/release +++ b/asset-transfer-basic/chaincode-external/sampleBuilder/bin/release @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/ci/scripts/lint-go.sh b/ci/scripts/lint-go.sh index e869ef1d..41776a9b 100755 --- a/ci/scripts/lint-go.sh +++ b/ci/scripts/lint-go.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail function print() { diff --git a/ci/scripts/lint-java.sh b/ci/scripts/lint-java.sh index 472b8571..c7b0980c 100755 --- a/ci/scripts/lint-java.sh +++ b/ci/scripts/lint-java.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail function print() { diff --git a/ci/scripts/lint-javascript.sh b/ci/scripts/lint-javascript.sh index 0279b125..391f537c 100755 --- a/ci/scripts/lint-javascript.sh +++ b/ci/scripts/lint-javascript.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail function print() { diff --git a/ci/scripts/lint-shell.sh b/ci/scripts/lint-shell.sh index dfec279a..fc61f068 100755 --- a/ci/scripts/lint-shell.sh +++ b/ci/scripts/lint-shell.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail shellcheck --version diff --git a/ci/scripts/lint-typescript.sh b/ci/scripts/lint-typescript.sh index 86bcc36b..b8c42d49 100755 --- a/ci/scripts/lint-typescript.sh +++ b/ci/scripts/lint-typescript.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail function print() { diff --git a/ci/scripts/lint.sh b/ci/scripts/lint.sh index 842be747..36607390 100755 --- a/ci/scripts/lint.sh +++ b/ci/scripts/lint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail cd "$(dirname "$0")/../.." diff --git a/ci/scripts/run-k8s-test-network-basic.sh b/ci/scripts/run-k8s-test-network-basic.sh index 65c6feb0..e95e5087 100755 --- a/ci/scripts/run-k8s-test-network-basic.sh +++ b/ci/scripts/run-k8s-test-network-basic.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash -e # # Copyright IBM Corp All Rights Reserved # diff --git a/ci/scripts/run-test-network-basic.sh b/ci/scripts/run-test-network-basic.sh index 448af4a0..dbc99b70 100755 --- a/ci/scripts/run-test-network-basic.sh +++ b/ci/scripts/run-test-network-basic.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/ci/scripts/run-test-network-events.sh b/ci/scripts/run-test-network-events.sh index ee4fe75f..1772a3ff 100755 --- a/ci/scripts/run-test-network-events.sh +++ b/ci/scripts/run-test-network-events.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/ci/scripts/run-test-network-hsm.sh b/ci/scripts/run-test-network-hsm.sh index 39bfd577..fcf807f8 100755 --- a/ci/scripts/run-test-network-hsm.sh +++ b/ci/scripts/run-test-network-hsm.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/ci/scripts/run-test-network-off-chain.sh b/ci/scripts/run-test-network-off-chain.sh index 872cda41..1a093599 100755 --- a/ci/scripts/run-test-network-off-chain.sh +++ b/ci/scripts/run-test-network-off-chain.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/ci/scripts/run-test-network-private.sh b/ci/scripts/run-test-network-private.sh index 914c94ba..15bd681d 100755 --- a/ci/scripts/run-test-network-private.sh +++ b/ci/scripts/run-test-network-private.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/ci/scripts/run-test-network-secured.sh b/ci/scripts/run-test-network-secured.sh index 19d13f1f..9c6de0ec 100755 --- a/ci/scripts/run-test-network-secured.sh +++ b/ci/scripts/run-test-network-secured.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/full-stack-asset-transfer-guide/checks/check-chaincode.sh b/full-stack-asset-transfer-guide/checks/check-chaincode.sh index 3a6cf115..323cc57b 100755 --- a/full-stack-asset-transfer-guide/checks/check-chaincode.sh +++ b/full-stack-asset-transfer-guide/checks/check-chaincode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eou pipefail diff --git a/full-stack-asset-transfer-guide/checks/check-kube.sh b/full-stack-asset-transfer-guide/checks/check-kube.sh index 82fb354b..546ee822 100755 --- a/full-stack-asset-transfer-guide/checks/check-kube.sh +++ b/full-stack-asset-transfer-guide/checks/check-kube.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail diff --git a/full-stack-asset-transfer-guide/checks/check-network.sh b/full-stack-asset-transfer-guide/checks/check-network.sh index 157d15b5..46229d13 100755 --- a/full-stack-asset-transfer-guide/checks/check-network.sh +++ b/full-stack-asset-transfer-guide/checks/check-network.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eou pipefail diff --git a/full-stack-asset-transfer-guide/checks/utils.sh b/full-stack-asset-transfer-guide/checks/utils.sh index 9c4a14ef..5115e1dc 100644 --- a/full-stack-asset-transfer-guide/checks/utils.sh +++ b/full-stack-asset-transfer-guide/checks/utils.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh b/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh index 39ac1a58..2a0e513e 100755 --- a/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh +++ b/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright contributors to the Hyperledgendary Full Stack Asset Transfer project # diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/network b/full-stack-asset-transfer-guide/infrastructure/sample-network/network index 90f562f6..436adb64 100755 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/network +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/network @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright contributors to the Hyperledger Fabric Operator project # diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/channel.sh b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/channel.sh index 7ad229dc..17596558 100644 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/channel.sh +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/channel.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright contributors to the Hyperledger Fabric Operator project # diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/console.sh b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/console.sh index d7863e53..3ad8c1bc 100644 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/console.sh +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/console.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright contributors to the Hyperledger Fabric Operator project # diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/prereqs.sh b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/prereqs.sh index ff37efdc..2c854287 100644 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/prereqs.sh +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/prereqs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright contributors to the Hyperledger Fabric Operator project # diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh index 8fd8d636..9dc72c6e 100644 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/sample_network.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright contributors to the Hyperledger Fabric Operator project # diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/utils.sh b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/utils.sh index 10bd6b2c..4be051b2 100644 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/utils.sh +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/utils.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright contributors to the Hyperledger Fabric Operator project # diff --git a/full-stack-asset-transfer-guide/justfile b/full-stack-asset-transfer-guide/justfile index c89438c0..664c0546 100644 --- a/full-stack-asset-transfer-guide/justfile +++ b/full-stack-asset-transfer-guide/justfile @@ -50,7 +50,7 @@ cluster_type := env_var_or_default("WORKSHOP_CLUSTER_TYPE", "k8s") # Start a local KIND cluster with nginx, localhost:5000 registry, and *.localho.st alias in kube DNS kind: unkind - #!/bin/bash + #!/usr/bin/env bash set -e -o pipefail infrastructure/kind_with_nginx.sh {{cluster_name}} @@ -62,7 +62,7 @@ kind: unkind # Shut down the KIND cluster unkind: - #!/bin/bash + #!/usr/bin/env bash kind delete cluster --name {{cluster_name}} if docker inspect kind-registry &>/dev/null; then @@ -73,7 +73,7 @@ unkind: # Bring up the nginx ingress controller on the target k8s cluster nginx: - #!/bin/bash + #!/usr/bin/env bash kubectl apply -k https://github.com/hyperledger-labs/fabric-operator.git/config/ingress/{{ cluster_runtime }} sleep 20 @@ -130,7 +130,7 @@ test-console: # Shut down the microfab (uf) instance microfab-down: - #!/bin/bash + #!/usr/bin/env bash if docker inspect microfab &>/dev/null; then echo "Removing existing microfab container:" @@ -140,7 +140,7 @@ microfab-down: # Start a micro fab instance and create configuration in _cfg/uf microfab: microfab-down - #!/bin/bash + #!/usr/bin/env bash set -e -o pipefail export CFG=$CWDIR/_cfg/uf @@ -207,7 +207,7 @@ microfab: microfab-down # Creates a chaincode package and install/approve/commit debugcc: - #!/bin/bash + #!/usr/bin/env bash set -e -o pipefail export CFG=$CWDIR/_cfg/uf @@ -297,7 +297,7 @@ ansible-doit: ansible-review-config ansible-operator ansible-console ansible-net # Review the Ansible Blockchain Collection configuration in _cfg/ ansible-review-config: - #!/bin/bash + #!/usr/bin/env bash mkdir -p ${CWDIR}/_cfg rm -rf ${CWDIR}/_cfg/* || true @@ -333,7 +333,7 @@ ansible-review-config: # Start the Kubernetes fabric-operator with the Ansible Blockchain Collection ansible-ingress: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail export EXTRAS="" @@ -355,7 +355,7 @@ ansible-ingress: # Start the Kubernetes fabric-operator with the Ansible Blockchain Collection ansible-operator: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail export EXTRAS="" @@ -374,7 +374,7 @@ ansible-operator: # Start the Fabric Operations Console with the Ansible Blockchain Collection ansible-console: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail export EXTRAS="" @@ -392,7 +392,7 @@ ansible-console: ansible-playbook /playbooks/02-console-install.yml ansible-auth: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail AUTH=$(curl -X POST https://{{namespace}}-hlf-console-console.{{ingress_domain}}:443/ak/api/v2/permissions/keys -u admin:password -k -H 'Content-Type: application/json' -d '{"roles": ["writer", "manager"],"description": "newkey"}') @@ -411,7 +411,7 @@ ansible-auth: # Build a sample Fabric network with the Ansible Blockchain Collection ansible-network: ansible-auth - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail export EXTRAS="" @@ -432,7 +432,7 @@ ansible-network: ansible-auth # Bring down the sample network created with the Ansible Blockchain Collection ansible-network-down: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail kubectl delete namespace {{ namespace }} --ignore-not-found @@ -440,7 +440,7 @@ ansible-network-down: # Build a chaincode package with Ansible Blockchain Collection ansible-build-chaincode: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail pushd ${CWDIR}/contracts/asset-transfer-typescript @@ -461,7 +461,7 @@ ansible-build-chaincode: # Deploy a chaincode package with the Ansible Blockchain Collection ansible-deploy-chaincode: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail export EXTRAS="" @@ -502,7 +502,7 @@ ansible-deploy-chaincode: # Creates a new identity for an application to use ansible-ready-application: - #!/bin/bash + #!/usr/bin/env bash set -ex -o pipefail export EXTRAS="" diff --git a/full-stack-asset-transfer-guide/tests/00-chaincode-e2e.sh b/full-stack-asset-transfer-guide/tests/00-chaincode-e2e.sh index 86030305..f1f9bb92 100755 --- a/full-stack-asset-transfer-guide/tests/00-chaincode-e2e.sh +++ b/full-stack-asset-transfer-guide/tests/00-chaincode-e2e.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -v -eou pipefail diff --git a/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh b/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh index f6f3d384..896a1717 100755 --- a/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh +++ b/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -v -eou pipefail diff --git a/full-stack-asset-transfer-guide/tests/30-ansible-e2e.sh b/full-stack-asset-transfer-guide/tests/30-ansible-e2e.sh index a5984635..550b133b 100755 --- a/full-stack-asset-transfer-guide/tests/30-ansible-e2e.sh +++ b/full-stack-asset-transfer-guide/tests/30-ansible-e2e.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -v -eou pipefail diff --git a/full-stack-asset-transfer-guide/tests/40-console.sh b/full-stack-asset-transfer-guide/tests/40-console.sh index 3fde9128..4b247e9c 100755 --- a/full-stack-asset-transfer-guide/tests/40-console.sh +++ b/full-stack-asset-transfer-guide/tests/40-console.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -v -eou pipefail diff --git a/high-throughput/networkDown.sh b/high-throughput/networkDown.sh index 6e898f50..20ea8007 100755 --- a/high-throughput/networkDown.sh +++ b/high-throughput/networkDown.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/high-throughput/startFabric.sh b/high-throughput/startFabric.sh index 72ca5a7c..06892e70 100755 --- a/high-throughput/startFabric.sh +++ b/high-throughput/startFabric.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/network b/test-network-k8s/network index 9d4414d8..45b8af96 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/application_connection.sh b/test-network-k8s/scripts/application_connection.sh index d91d7ccb..c470eb41 100755 --- a/test-network-k8s/scripts/application_connection.sh +++ b/test-network-k8s/scripts/application_connection.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/chaincode.sh b/test-network-k8s/scripts/chaincode.sh index 5a560f64..c8e57ea4 100755 --- a/test-network-k8s/scripts/chaincode.sh +++ b/test-network-k8s/scripts/chaincode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/channel.sh b/test-network-k8s/scripts/channel.sh index 942681a1..67a1890a 100644 --- a/test-network-k8s/scripts/channel.sh +++ b/test-network-k8s/scripts/channel.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/cluster.sh b/test-network-k8s/scripts/cluster.sh index c93cee69..38c648bb 100644 --- a/test-network-k8s/scripts/cluster.sh +++ b/test-network-k8s/scripts/cluster.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/fabric_CAs.sh b/test-network-k8s/scripts/fabric_CAs.sh index 17b9979c..156e4bca 100755 --- a/test-network-k8s/scripts/fabric_CAs.sh +++ b/test-network-k8s/scripts/fabric_CAs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/fabric_config.sh b/test-network-k8s/scripts/fabric_config.sh index d4c7eee2..dea7ab74 100755 --- a/test-network-k8s/scripts/fabric_config.sh +++ b/test-network-k8s/scripts/fabric_config.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/kind.sh b/test-network-k8s/scripts/kind.sh index 880f5d7d..c2126196 100755 --- a/test-network-k8s/scripts/kind.sh +++ b/test-network-k8s/scripts/kind.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/prereqs.sh b/test-network-k8s/scripts/prereqs.sh index 74aaa3b6..dbe7025f 100755 --- a/test-network-k8s/scripts/prereqs.sh +++ b/test-network-k8s/scripts/prereqs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/rest_sample.sh b/test-network-k8s/scripts/rest_sample.sh index 8da61efd..e7cda985 100755 --- a/test-network-k8s/scripts/rest_sample.sh +++ b/test-network-k8s/scripts/rest_sample.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/set_anchor_peer.sh b/test-network-k8s/scripts/set_anchor_peer.sh index 3942aa16..4370e809 100755 --- a/test-network-k8s/scripts/set_anchor_peer.sh +++ b/test-network-k8s/scripts/set_anchor_peer.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp. All Rights Reserved. # diff --git a/test-network-k8s/scripts/test_network.sh b/test-network-k8s/scripts/test_network.sh index 3903bfe2..5ff1dbd4 100755 --- a/test-network-k8s/scripts/test_network.sh +++ b/test-network-k8s/scripts/test_network.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-k8s/scripts/utils.sh b/test-network-k8s/scripts/utils.sh index 4f1615c3..19839e31 100644 --- a/test-network-k8s/scripts/utils.sh +++ b/test-network-k8s/scripts/utils.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network-nano-bash/ca/ccp-generate.sh b/test-network-nano-bash/ca/ccp-generate.sh index a71f60b1..9aa298e6 100755 --- a/test-network-nano-bash/ca/ccp-generate.sh +++ b/test-network-nano-bash/ca/ccp-generate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function one_line_pem { echo "`awk 'NF {sub(/\\n/, ""); printf "%s\\\\\\\n",$0;}' $1`" diff --git a/test-network/addOrg3/addOrg3.sh b/test-network/addOrg3/addOrg3.sh index 2d14c817..77a0cf33 100755 --- a/test-network/addOrg3/addOrg3.sh +++ b/test-network/addOrg3/addOrg3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network/addOrg3/ccp-generate.sh b/test-network/addOrg3/ccp-generate.sh index a361a9d4..0cc2957a 100755 --- a/test-network/addOrg3/ccp-generate.sh +++ b/test-network/addOrg3/ccp-generate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function one_line_pem { echo "`awk 'NF {sub(/\\n/, ""); printf "%s\\\\\\\n",$0;}' $1`" diff --git a/test-network/addOrg3/fabric-ca/registerEnroll.sh b/test-network/addOrg3/fabric-ca/registerEnroll.sh index 0c43aaf5..08913d08 100644 --- a/test-network/addOrg3/fabric-ca/registerEnroll.sh +++ b/test-network/addOrg3/fabric-ca/registerEnroll.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network/monitordocker.sh b/test-network/monitordocker.sh index c32986c8..0b3e3a5f 100755 --- a/test-network/monitordocker.sh +++ b/test-network/monitordocker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script uses the logspout and http stream tools to let you watch the docker containers # in action. diff --git a/test-network/network.sh b/test-network/network.sh index f20d83e5..9f8b375a 100755 --- a/test-network/network.sh +++ b/test-network/network.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # @@ -265,7 +265,7 @@ function createOrgs() { fi infoln "Generating CCP files for Org1 and Org2" - bash ./organizations/ccp-generate.sh + ./organizations/ccp-generate.sh } # Once you create the organization crypto material, you need to create the @@ -348,13 +348,13 @@ function createChannel() { # now run the script that creates a channel. This script uses configtxgen once # to create the channel creation transaction and the anchor peer updates. - bash scripts/createChannel.sh $CHANNEL_NAME $CLI_DELAY $MAX_RETRY $VERBOSE $bft_true + scripts/createChannel.sh $CHANNEL_NAME $CLI_DELAY $MAX_RETRY $VERBOSE $bft_true } ## Call the script to deploy a chaincode to the channel function deployCC() { - bash scripts/deployCC.sh $CHANNEL_NAME $CC_NAME $CC_SRC_PATH $CC_SRC_LANGUAGE $CC_VERSION $CC_SEQUENCE $CC_INIT_FCN $CC_END_POLICY $CC_COLL_CONFIG $CLI_DELAY $MAX_RETRY $VERBOSE + scripts/deployCC.sh $CHANNEL_NAME $CC_NAME $CC_SRC_PATH $CC_SRC_LANGUAGE $CC_VERSION $CC_SEQUENCE $CC_INIT_FCN $CC_END_POLICY $CC_COLL_CONFIG $CLI_DELAY $MAX_RETRY $VERBOSE if [ $? -ne 0 ]; then fatalln "Deploying chaincode failed" diff --git a/test-network/organizations/ccp-generate.sh b/test-network/organizations/ccp-generate.sh index 7e091d0b..d0ee19b4 100755 --- a/test-network/organizations/ccp-generate.sh +++ b/test-network/organizations/ccp-generate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function one_line_pem { echo "`awk 'NF {sub(/\\n/, ""); printf "%s\\\\\\\n",$0;}' $1`" diff --git a/test-network/organizations/cfssl/registerEnroll.sh b/test-network/organizations/cfssl/registerEnroll.sh index d5bac21e..e79da3f5 100755 --- a/test-network/organizations/cfssl/registerEnroll.sh +++ b/test-network/organizations/cfssl/registerEnroll.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright 2023 Aditya Joshi, All rights reserved function peer_cert() { diff --git a/test-network/organizations/fabric-ca/registerEnroll.sh b/test-network/organizations/fabric-ca/registerEnroll.sh index e0635490..e264f1f9 100755 --- a/test-network/organizations/fabric-ca/registerEnroll.sh +++ b/test-network/organizations/fabric-ca/registerEnroll.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function createOrg1() { infoln "Enrolling the CA admin" diff --git a/test-network/scripts/ccutils.sh b/test-network/scripts/ccutils.sh index bc7f3bb0..164d5bb1 100644 --- a/test-network/scripts/ccutils.sh +++ b/test-network/scripts/ccutils.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # installChaincode PEER ORG function installChaincode() { diff --git a/test-network/scripts/configUpdate.sh b/test-network/scripts/configUpdate.sh index 63586031..027b80a0 100755 --- a/test-network/scripts/configUpdate.sh +++ b/test-network/scripts/configUpdate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp. All Rights Reserved. # diff --git a/test-network/scripts/createChannel.sh b/test-network/scripts/createChannel.sh index f3ff3915..af31fee7 100755 --- a/test-network/scripts/createChannel.sh +++ b/test-network/scripts/createChannel.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # imports . scripts/envVar.sh diff --git a/test-network/scripts/deployCC.sh b/test-network/scripts/deployCC.sh index f3c4eebd..249b3100 100755 --- a/test-network/scripts/deployCC.sh +++ b/test-network/scripts/deployCC.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source scripts/utils.sh @@ -69,7 +69,7 @@ function checkPrereqs() { checkPrereqs ## package the chaincode -bash ./scripts/packageCC.sh $CC_NAME $CC_SRC_PATH $CC_SRC_LANGUAGE $CC_VERSION +./scripts/packageCC.sh $CC_NAME $CC_SRC_PATH $CC_SRC_LANGUAGE $CC_VERSION PACKAGE_ID=$(peer lifecycle chaincode calculatepackageid ${CC_NAME}.tar.gz) diff --git a/test-network/scripts/deployCCAAS.sh b/test-network/scripts/deployCCAAS.sh index bc36d589..2cd3c6c9 100755 --- a/test-network/scripts/deployCCAAS.sh +++ b/test-network/scripts/deployCCAAS.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # # Copyright IBM Corp. All Rights Reserved. diff --git a/test-network/scripts/envVar.sh b/test-network/scripts/envVar.sh index a446c9b3..6e051ac1 100755 --- a/test-network/scripts/envVar.sh +++ b/test-network/scripts/envVar.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp All Rights Reserved # diff --git a/test-network/scripts/orderer.sh b/test-network/scripts/orderer.sh index e18a89c9..3c921908 100644 --- a/test-network/scripts/orderer.sh +++ b/test-network/scripts/orderer.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash channel_name=$1 diff --git a/test-network/scripts/orderer2.sh b/test-network/scripts/orderer2.sh index 978aab2d..975da9f6 100755 --- a/test-network/scripts/orderer2.sh +++ b/test-network/scripts/orderer2.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash channel_name=$1 diff --git a/test-network/scripts/orderer3.sh b/test-network/scripts/orderer3.sh index 8b216eba..c8b54cdc 100644 --- a/test-network/scripts/orderer3.sh +++ b/test-network/scripts/orderer3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash channel_name=$1 diff --git a/test-network/scripts/orderer4.sh b/test-network/scripts/orderer4.sh index 3c572770..0139bc44 100644 --- a/test-network/scripts/orderer4.sh +++ b/test-network/scripts/orderer4.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash channel_name=$1 diff --git a/test-network/scripts/org3-scripts/joinChannel.sh b/test-network/scripts/org3-scripts/joinChannel.sh index 53f3f0b8..a5b32bf5 100755 --- a/test-network/scripts/org3-scripts/joinChannel.sh +++ b/test-network/scripts/org3-scripts/joinChannel.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp. All Rights Reserved. # diff --git a/test-network/scripts/org3-scripts/updateChannelConfig.sh b/test-network/scripts/org3-scripts/updateChannelConfig.sh index a34b4e92..86735f84 100755 --- a/test-network/scripts/org3-scripts/updateChannelConfig.sh +++ b/test-network/scripts/org3-scripts/updateChannelConfig.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp. All Rights Reserved. # diff --git a/test-network/scripts/packageCC.sh b/test-network/scripts/packageCC.sh index c4a3d30f..e457164d 100755 --- a/test-network/scripts/packageCC.sh +++ b/test-network/scripts/packageCC.sh @@ -1,6 +1,4 @@ -#!/bin/bash - -#!/bin/bash +#!/usr/bin/env bash source scripts/utils.sh diff --git a/test-network/scripts/pkgcc.sh b/test-network/scripts/pkgcc.sh index 6b89461f..7538e474 100755 --- a/test-network/scripts/pkgcc.sh +++ b/test-network/scripts/pkgcc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # SPDX-License-Identifier: Apache-2.0 diff --git a/test-network/scripts/setAnchorPeer.sh b/test-network/scripts/setAnchorPeer.sh index 15f7ad2e..f64f1bf1 100755 --- a/test-network/scripts/setAnchorPeer.sh +++ b/test-network/scripts/setAnchorPeer.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright IBM Corp. All Rights Reserved. # diff --git a/test-network/scripts/utils.sh b/test-network/scripts/utils.sh index 9b40a966..1006b589 100755 --- a/test-network/scripts/utils.sh +++ b/test-network/scripts/utils.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash C_RESET='\033[0m' C_RED='\033[0;31m' @@ -210,6 +210,7 @@ function installPrereqs() { FILE=../install-fabric.sh if [ ! -f $FILE ]; then curl -sSLO https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh && chmod +x install-fabric.sh + sed -i '1s|.*|#!/usr/bin/env bash|' install-fabric.sh cp install-fabric.sh .. fi @@ -224,7 +225,7 @@ function installPrereqs() { fi cd .. - bash ./install-fabric.sh ${IMAGE_PARAMETER} ${CA_IMAGE_PARAMETER} docker binary + ./install-fabric.sh ${IMAGE_PARAMETER} ${CA_IMAGE_PARAMETER} docker binary } diff --git a/test-network/setOrgEnv.sh b/test-network/setOrgEnv.sh index 2b78921b..630ab87c 100755 --- a/test-network/setOrgEnv.sh +++ b/test-network/setOrgEnv.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # SPDX-License-Identifier: Apache-2.0 diff --git a/token-sdk/scripts/down.sh b/token-sdk/scripts/down.sh index a6c5b97d..71380c5a 100755 --- a/token-sdk/scripts/down.sh +++ b/token-sdk/scripts/down.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # This script fully tears down and deletes all artifacts from the sample network that was started with ./scripts/up.sh. diff --git a/token-sdk/scripts/enroll-users.sh b/token-sdk/scripts/enroll-users.sh index 70a6ddf0..2da79a42 100755 --- a/token-sdk/scripts/enroll-users.sh +++ b/token-sdk/scripts/enroll-users.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Register and enroll all identities needed for the Token network. diff --git a/token-sdk/scripts/up.sh b/token-sdk/scripts/up.sh index 69ecaabc..e02e71e2 100755 --- a/token-sdk/scripts/up.sh +++ b/token-sdk/scripts/up.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # This script generates crypto, starts Fabric, deploys the chaincode and starts the token nodes.