From 4d78fe91fdfa9c135ec526849be84b34fef3c0f0 Mon Sep 17 00:00:00 2001
From: Robert Dill <rddill@us.ibm.com>
Date: Wed, 24 Jan 2018 09:26:18 -0500
Subject: [PATCH] update startup.sh

---
 Chapter03/network/dist/networkadmin.card | Bin 0 -> 622 bytes
 Chapter03/startup.sh                     |   4 ++--
 Chapter04/startup.sh                     |   4 ++--
 Chapter05/startup.sh                     |   4 ++--
 Chapter06/startup.sh                     |   4 ++--
 Chapter07/startup.sh                     |   4 ++--
 Chapter08/startup.sh                     |   4 ++--
 Chapter09/startup.sh                     |   4 ++--
 Chapter10/startup.sh                     |   4 ++--
 Chapter11/startup.sh                     |   4 ++--
 Chapter12/startup.sh                     |   4 ++--
 fix_scripts.sh                           |   3 ++-
 12 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 Chapter03/network/dist/networkadmin.card

diff --git a/Chapter03/network/dist/networkadmin.card b/Chapter03/network/dist/networkadmin.card
new file mode 100644
index 0000000000000000000000000000000000000000..dd828e04f7ff2f9936de117fd3ce7d1deaf2481d
GIT binary patch
literal 622
zcmaJ<%}&BV5H9$0Ffm?Cym^?Ic&ViXjY-d342X@ylku=DBQ11y>+Tj%LgFLn!FTc@
zJoqS1r9^0g+f177d^_LIHf(Ke?>YH8`8aLAeh!+)701czfcChO61k0)^oB;s8Av7&
z0*I2waUEQ+&*|!?(tXsZ4FvZy$aF%;flhf)t0juFBvQr(m;Qwh^9L6=gJ6k@tWC?P
zbDCe!apoyKsCzhNB2CcaO2FKO6qj5YpE5M|?zX*wG8c<ul>a~)3sn&#%eitQNtHp(
ziyaq)Nw1pJxgjmr-7xnb3sjkfpyB)Ta4pLBqqnaiMVQw<l|ak-%(5cLF-fObA*j2M
z5ld$gEbEI{(%@cZVu{9d&`y*d5$OwRWmS)Y9Fd|}p2?y`#-vtBBFJ4Axki!$zjM+F
rkf=)a(Aj*$q-<rC?z?=r?CI}hi+-3jhhb}HH*Z(znbP~40FLtmss^p_

literal 0
HcmV?d00001

diff --git a/Chapter03/startup.sh b/Chapter03/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter03/startup.sh
+++ b/Chapter03/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter04/startup.sh b/Chapter04/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter04/startup.sh
+++ b/Chapter04/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter05/startup.sh b/Chapter05/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter05/startup.sh
+++ b/Chapter05/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter06/startup.sh b/Chapter06/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter06/startup.sh
+++ b/Chapter06/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter07/startup.sh b/Chapter07/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter07/startup.sh
+++ b/Chapter07/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter08/startup.sh b/Chapter08/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter08/startup.sh
+++ b/Chapter08/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter09/startup.sh b/Chapter09/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter09/startup.sh
+++ b/Chapter09/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter10/startup.sh b/Chapter10/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter10/startup.sh
+++ b/Chapter10/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter11/startup.sh b/Chapter11/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter11/startup.sh
+++ b/Chapter11/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/Chapter12/startup.sh b/Chapter12/startup.sh
index a4602d8..e5a4d7f 100755
--- a/Chapter12/startup.sh
+++ b/Chapter12/startup.sh
@@ -34,13 +34,13 @@ function showStep ()
 showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
 cd "${HLF_INSTALL_PATH}"
 showStep "starting fabric"
-~/fabric-tools/startFabric.sh
+./startFabric.sh
 #
 # no longer required with hyperledger composer V0.15
 # showStep "creating new composer profile (required with each restart)"
 # ~/fabric-tools/createComposerProfile.sh
 #
 showStep "creating new PeerAdmin card (required with each restart)"
-~/fabric-tools/createPeerAdminCard.sh 
+./createPeerAdminCard.sh 
 composer card list --name PeerAdmin@hlfv1
 showStep "start up complete"
\ No newline at end of file
diff --git a/fix_scripts.sh b/fix_scripts.sh
index 85bb280..5c522aa 100755
--- a/fix_scripts.sh
+++ b/fix_scripts.sh
@@ -2,7 +2,8 @@
 
 # make scripts correct for osx/unix
 
-declare -a chapters=('Chapter01' 'Chapter02' 'Chapter03' 'Chapter04' 'Chapter05' 'Chapter06' 'Chapter07' 'Chapter08' 'Chapter09' 'Chapter10' 'Chapter11' 'Chapter12')
+declare -a chapters=($(ls -d -- */))
+echo "${chapters[@]}"
 dos2unix `ls *.sh`
 for i in "${chapters[@]}"
 do