From 424c429f39d85659fc5508d9e1eb6161d217ed1b Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Mon, 6 May 2024 10:27:18 -0400 Subject: [PATCH] Remove double quotes for env variables Double quotes have caused issues in some environments, e.g. see https://github.com/hyperledger/fabric/issues/4358 Signed-off-by: David Enyeart --- asset-transfer-abac/README.md | 2 +- asset-transfer-sbe/README.md | 2 +- auction-dutch/README.md | 2 +- test-network-k8s/scripts/set_anchor_peer.sh | 4 ++-- test-network/CHAINCODE_AS_A_SERVICE_TUTORIAL.md | 2 +- test-network/scripts/envVar.sh | 6 +++--- token-erc-1155/README.md | 4 ++-- token-erc-20/README.md | 6 +++--- token-erc-721/README.md | 8 ++++---- token-utxo/README.md | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/asset-transfer-abac/README.md b/asset-transfer-abac/README.md index a4f3ec4d8f..09cb106cdd 100644 --- a/asset-transfer-abac/README.md +++ b/asset-transfer-abac/README.md @@ -76,7 +76,7 @@ You can use either identity with the `abac.creator=true` attribute to create an ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/creator1@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 diff --git a/asset-transfer-sbe/README.md b/asset-transfer-sbe/README.md index 213216d739..87bb99aa78 100644 --- a/asset-transfer-sbe/README.md +++ b/asset-transfer-sbe/README.md @@ -73,7 +73,7 @@ Set the following environment variables to interact with the network as a user f export PATH=${PWD}/../bin:${PWD}:$PATH export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 diff --git a/auction-dutch/README.md b/auction-dutch/README.md index 1995d507e1..12d79b1aa1 100644 --- a/auction-dutch/README.md +++ b/auction-dutch/README.md @@ -49,7 +49,7 @@ Set the following environment to interact with the test network as Org3. export PATH=${PWD}/../bin:$PATH export FABRIC_CFG_PATH=${PWD}/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org3MSP" +export CORE_PEER_LOCALMSPID=Org3MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp export CORE_PEER_ADDRESS=localhost:11051 diff --git a/test-network-k8s/scripts/set_anchor_peer.sh b/test-network-k8s/scripts/set_anchor_peer.sh index 80c32825a6..3942aa16c1 100755 --- a/test-network-k8s/scripts/set_anchor_peer.sh +++ b/test-network-k8s/scripts/set_anchor_peer.sh @@ -98,12 +98,12 @@ set -x ORG_NUM=$1 CHANNEL_NAME=$2 PEER_NAME=$3 -ORG_NAME="org${ORG_NUM}" +ORG_NAME=org${ORG_NUM} ANCHOR_PEER_HOST=${ORG_NAME}-${PEER_NAME} ANCHOR_PEER_PORT=7051 ORDERER_TLS_CA_FILE=/var/hyperledger/fabric/organizations/ordererOrganizations/org0.example.com/msp/tlscacerts/org0-tls-ca.pem -export CORE_PEER_LOCALMSPID="Org${ORG_NUM}MSP" +export CORE_PEER_LOCALMSPID=Org${ORG_NUM}MSP set_anchor_peer diff --git a/test-network/CHAINCODE_AS_A_SERVICE_TUTORIAL.md b/test-network/CHAINCODE_AS_A_SERVICE_TUTORIAL.md index 33d83ffde7..6482a64bff 100644 --- a/test-network/CHAINCODE_AS_A_SERVICE_TUTORIAL.md +++ b/test-network/CHAINCODE_AS_A_SERVICE_TUTORIAL.md @@ -58,7 +58,7 @@ To test things are working you can invoke the 'Contract Metadata' function. For # Environment variables for Org1 export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 diff --git a/test-network/scripts/envVar.sh b/test-network/scripts/envVar.sh index 15b5ba80de..a446c9b39b 100755 --- a/test-network/scripts/envVar.sh +++ b/test-network/scripts/envVar.sh @@ -33,17 +33,17 @@ setGlobals() { fi infoln "Using organization ${USING_ORG}" if [ $USING_ORG -eq 1 ]; then - export CORE_PEER_LOCALMSPID="Org1MSP" + export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG1_CA export CORE_PEER_MSPCONFIGPATH=${TEST_NETWORK_HOME}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 elif [ $USING_ORG -eq 2 ]; then - export CORE_PEER_LOCALMSPID="Org2MSP" + export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG2_CA export CORE_PEER_MSPCONFIGPATH=${TEST_NETWORK_HOME}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051 elif [ $USING_ORG -eq 3 ]; then - export CORE_PEER_LOCALMSPID="Org3MSP" + export CORE_PEER_LOCALMSPID=Org3MSP export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG3_CA export CORE_PEER_MSPCONFIGPATH=${TEST_NETWORK_HOME}/organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp export CORE_PEER_ADDRESS=localhost:11051 diff --git a/token-erc-1155/README.md b/token-erc-1155/README.md index d891c938aa..c6ddfc49fb 100644 --- a/token-erc-1155/README.md +++ b/token-erc-1155/README.md @@ -140,7 +140,7 @@ Note that we need to call the initialize function before being able to use any f Shift back to the Org1 terminal, we'll set the following environment variables to operate the `peer` CLI as the minter identity from Org1. ```bash export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/person1@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -224,7 +224,7 @@ Switch to the Org2 terminal and set the following environment variables. ```bash export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/person2@org2.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:9051 diff --git a/token-erc-20/README.md b/token-erc-20/README.md index c1d5e02837..0bc5b0c3f6 100644 --- a/token-erc-20/README.md +++ b/token-erc-20/README.md @@ -110,7 +110,7 @@ Note that we need to call the initialize function before being able to use any f Shift back to the Org1 terminal, we'll set the following environment variables to operate the `peer` CLI as the minter identity from Org1. ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/minter@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -151,7 +151,7 @@ Let's prepare the Org2 terminal by setting the environment variables for the Org ``` export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/recipient@org2.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:9051 @@ -279,7 +279,7 @@ Open a 3rd terminal to represent the spender in Org1 and navigate to fabric-samp export PATH=${PWD}/../bin:${PWD}:$PATH export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/spender@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 diff --git a/token-erc-721/README.md b/token-erc-721/README.md index 3c54d76cf0..2fc60f0ed4 100644 --- a/token-erc-721/README.md +++ b/token-erc-721/README.md @@ -105,7 +105,7 @@ Note that we need to call the initialize function before being able to use any f Shift back to the Org1 terminal, we'll set the following environment variables to operate the `peer` CLI as the minter identity from Org1. ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/minter@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -123,7 +123,7 @@ Now that we have initialized the contract and created the identity of the minter Shift back to the Org1 terminal, we'll set the following environment variables to operate the `peer` CLI as the minter identity from Org1. ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/minter@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -165,7 +165,7 @@ Let's prepare the Org2 terminal by setting the environment variables for the Org ``` export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/recipient@org2.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:9051 @@ -280,7 +280,7 @@ Open a 3rd terminal to represent the operator in Org1 and navigate to fabric-sam export PATH=${PWD}/../bin:${PWD}:$PATH export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/operator@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 diff --git a/token-utxo/README.md b/token-utxo/README.md index 0a85f73a91..1d9adb04ec 100644 --- a/token-utxo/README.md +++ b/token-utxo/README.md @@ -99,7 +99,7 @@ Note that we need to call the initialize function before being able to use any f Shift back to the Org1 terminal, we'll set the following environment variables to operate the `peer` CLI as the minter identity from Org1. ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/minter@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -117,7 +117,7 @@ Now that we have initialized the contract and created the identity of the minter Shift back to the Org1 terminal, we'll set the following environment variables to operate the `peer` CLI as the minter identity from Org1. ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/minter@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -161,7 +161,7 @@ Let's prepare the Org2 terminal by setting the environment variables for the Org ``` export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/recipient@org2.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:9051