From 3fbce62c01ac168cabd7ed6b07a6ca0f19003f15 Mon Sep 17 00:00:00 2001
From: Arnaud J Le Hors <lehors@us.ibm.com>
Date: Tue, 27 Oct 2020 17:07:49 +0100
Subject: [PATCH] Fix commercial paper org scripts (#362)

The current scripts given to setup the user environment do not work
on Mac:

$ . ./magnetocorp.sh
-bash: cd: /Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp
Saving session...
...copying shared history...
...saving history...truncating history files...
...completed./../../../test-network: No such file or directory
-bash: ./scripts/envVar.sh: No such file or directory
[...truncated...]
export FABRIC_CFG_PATH="/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp"
export PATH="/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp"
export PEER_PARMS=""
Saving session...
Saving session...

The session history related output is actually captured when setting the environment variables:

$ echo $FABRIC_CFG_PATH
/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp
Saving session...
...copying shared history...
...saving history...truncating history files...
...completed./../../../config

With this simple change the scripts work:

$ echo $FABRIC_CFG_PATH
/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp/../../../config

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
---
 commercial-paper/organization/digibank/digibank.sh       | 4 ++--
 commercial-paper/organization/magnetocorp/magnetocorp.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/commercial-paper/organization/digibank/digibank.sh b/commercial-paper/organization/digibank/digibank.sh
index 3aad75d2..414d4d2e 100755
--- a/commercial-paper/organization/digibank/digibank.sh
+++ b/commercial-paper/organization/digibank/digibank.sh
@@ -15,7 +15,7 @@ function _exit(){
 : ${VERBOSE:="false"}
 
 # Where am I?
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR=${PWD}
 
 # Locate the test network
 cd "${DIR}/../../../test-network"
@@ -36,4 +36,4 @@ env | sort | comm -1 -3 /tmp/env.orig - | sed -E 's/(.*)=(.*)/export \1="\2"/'
 
 rm /tmp/env.orig
 
-cd ${DIR}
\ No newline at end of file
+cd ${DIR}
diff --git a/commercial-paper/organization/magnetocorp/magnetocorp.sh b/commercial-paper/organization/magnetocorp/magnetocorp.sh
index af456384..784602ca 100755
--- a/commercial-paper/organization/magnetocorp/magnetocorp.sh
+++ b/commercial-paper/organization/magnetocorp/magnetocorp.sh
@@ -15,7 +15,7 @@ function _exit(){
 : ${VERBOSE:="false"}
 
 # Where am I?
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR=${PWD}
 
 # Locate the test-network 
 cd "${DIR}/../../../test-network"
@@ -35,4 +35,4 @@ export PATH="${DIR}/../../../bin:${PWD}:$PATH"
 env | sort | comm -1 -3 /tmp/env.orig - | sed -E 's/(.*)=(.*)/export \1="\2"/'
 rm /tmp/env.orig
 
-cd ${DIR}
\ No newline at end of file
+cd ${DIR}