From fd89236147fec654711d8e15696f1777bc8c0d82 Mon Sep 17 00:00:00 2001
From: rdlrt <3169068+rdlrt@users.noreply.github.com>
Date: Mon, 3 Aug 2020 06:15:14 +0000
Subject: [PATCH] Update wordings in cntools for pool startup command, change
 default prereqs to point to mainnet

---
 scripts/cnode-helper-scripts/cntools.sh    | 12 ++++++------
 scripts/cnode-helper-scripts/itnRewards.sh |  0
 scripts/cnode-helper-scripts/prereqs.sh    |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 scripts/cnode-helper-scripts/itnRewards.sh

diff --git a/scripts/cnode-helper-scripts/cntools.sh b/scripts/cnode-helper-scripts/cntools.sh
index 73dbf7a9b..ff2fa11a0 100755
--- a/scripts/cnode-helper-scripts/cntools.sh
+++ b/scripts/cnode-helper-scripts/cntools.sh
@@ -1674,9 +1674,9 @@ case $OPERATION in
     say "Margin : ${margin}%" "log"
     say "Cost   : $(formatLovelace ${cost_lovelace}) ADA" "log"
     say ""
-    say "Start cardano node with the following run arguments:" "log"
-    say "--shelley-kes-key ${pool_hotkey_sk_file}" "log"
-    say "--shelley-vrf-key ${pool_vrf_sk_file}" "log"
+    say "Append cardano node start command with the following run arguments:" "log"
+    say "--shelley-kes-key ${pool_hotkey_sk_file} \\" "log"
+    say "--shelley-vrf-key ${pool_vrf_sk_file} \\" "log"
     say "--shelley-operational-certificate ${pool_opcert_file}" "log"
     if [[ ${lovelace} -lt ${pledge_lovelace} ]]; then
       say ""
@@ -2471,9 +2471,9 @@ case $OPERATION in
     pool_hotkey_sk_file="${POOL_FOLDER}/${pool_name}/${POOL_HOTKEY_SK_FILENAME}"
     pool_vrf_sk_file="${POOL_FOLDER}/${pool_name}/${POOL_VRF_SK_FILENAME}"
     pool_opcert_file="${POOL_FOLDER}/${pool_name}/${POOL_OPCERT_FILENAME}"
-    say "$(printf "%-21s : %s" "Run arguments" "--shelley-kes-key ${pool_hotkey_sk_file}")" "log"
-    say "$(printf "%-21s   %s" "" "--shelley-vrf-key ${pool_vrf_sk_file}")" "log"
-    say "$(printf "%-21s   %s" "" "--shelley-operational-certificate ${pool_opcert_file}")" "log"
+    say "$(printf "%-21s : %s" "Run arguments" "--shelley-kes-key ${pool_hotkey_sk_file} \\")" "log"
+    say "$(printf "%-21s   %s" "" "--shelley-vrf-key ${pool_vrf_sk_file} \\")" "log"
+    say "$(printf "%-21s   %s" "" "--shelley-operational-certificate ${pool_opcert_file} \\")" "log"
     say ""
     say "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
     waitForInput
diff --git a/scripts/cnode-helper-scripts/itnRewards.sh b/scripts/cnode-helper-scripts/itnRewards.sh
old mode 100644
new mode 100755
diff --git a/scripts/cnode-helper-scripts/prereqs.sh b/scripts/cnode-helper-scripts/prereqs.sh
index 98f342cbc..8991b535f 100755
--- a/scripts/cnode-helper-scripts/prereqs.sh
+++ b/scripts/cnode-helper-scripts/prereqs.sh
@@ -220,9 +220,9 @@ if [[ "$GUILD" = "Y" ]]; then
   curl -s -o byron-genesis.json https://raw.githubusercontent.com/cardano-community/guild-operators/master/files/byron-genesis.json
   curl -s -o topology.json https://raw.githubusercontent.com/cardano-community/guild-operators/master/files/topology.json
 else
-  curl -sL -o byron-genesis.json ${OVERWRITE} https://hydra.iohk.io/job/Cardano/iohk-nix/cardano-deployment/latest-finished/download/1/mainnet_candidate_4-byron-genesis.json
-  curl -sL -o genesis.json ${OVERWRITE} https://hydra.iohk.io/job/Cardano/iohk-nix/cardano-deployment/latest-finished/download/1/mainnet_candidate_4-shelley-genesis.json
-  curl -sL -o topology.json ${OVERWRITE} https://hydra.iohk.io/job/Cardano/iohk-nix/cardano-deployment/latest-finished/download/1/mainnet_candidate_4-topology.json
+  curl -sL -o byron-genesis.json ${OVERWRITE} https://hydra.iohk.io/job/Cardano/iohk-nix/cardano-deployment/latest-finished/download/1/mainnet_candidate-byron-genesis.json
+  curl -sL -o genesis.json ${OVERWRITE} https://hydra.iohk.io/job/Cardano/iohk-nix/cardano-deployment/latest-finished/download/1/mainnet_candidate-shelley-genesis.json
+  curl -sL -o topology.json ${OVERWRITE} https://hydra.iohk.io/job/Cardano/iohk-nix/cardano-deployment/latest-finished/download/1/mainnet_candidate-topology.json
 fi
 
 if [[ "$PRAOS" = "Y" ]]; then