update startup.sh

rddill-IBM · Jan 24, 2018 · 4d78fe9 · 4d78fe9
1 parent 6ce879a
commit 4d78fe9
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 21 deletions.
diff --git a/Chapter03/network/dist/networkadmin.card b/Chapter03/network/dist/networkadmin.card
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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