From 6ad4a81123ced98baae8d45cfa503a83e8826fc9 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 4 Sep 2018 14:36:35 -0700
Subject: [PATCH] s/_/-/g in filenames

---
 net/gce.sh                                          |  6 +++---
 net/net.sh                                          | 12 ++++++------
 net/remote/{remote_client.sh => remote-client.sh}   |  0
 net/remote/{remote_node.sh => remote-node.sh}       |  0
 net/remote/{remote_sanity.sh => remote-sanity.sh}   |  0
 net/remote/{remote_startup.sh => remote-startup.sh} |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename net/remote/{remote_client.sh => remote-client.sh} (100%)
 rename net/remote/{remote_node.sh => remote-node.sh} (100%)
 rename net/remote/{remote_sanity.sh => remote-sanity.sh} (100%)
 rename net/remote/{remote_startup.sh => remote-startup.sh} (100%)

diff --git a/net/gce.sh b/net/gce.sh
index c36101381..1dd595ee0 100755
--- a/net/gce.sh
+++ b/net/gce.sh
@@ -182,12 +182,12 @@ create)
   echo ==================================================================
   echo
   gcloud_CreateInstances "$prefix-leader" 1 \
-    "$zone" "$imageName" "$leaderMachineType" "$leaderAccelerator" "$here/remote/remote_startup.sh"
+    "$zone" "$imageName" "$leaderMachineType" "$leaderAccelerator" "$here/remote/remote-startup.sh"
   gcloud_CreateInstances "$prefix-validator" "$validatorNodeCount" \
-    "$zone" "$imageName" "$validatorMachineType" "$validatorAccelerator" "$here/remote/remote_startup.sh"
+    "$zone" "$imageName" "$validatorMachineType" "$validatorAccelerator" "$here/remote/remote-startup.sh"
   if [[ -n $clientNodeCount ]]; then
     gcloud_CreateInstances "$prefix-client" "$clientNodeCount" \
-      "$zone" "$imageName" "$clientMachineType" "$clientAccelerator" "$here/remote/remote_startup.sh"
+      "$zone" "$imageName" "$clientMachineType" "$clientAccelerator" "$here/remote/remote-startup.sh"
   fi
 
   prepareInstancesAndWriteConfigFile
diff --git a/net/net.sh b/net/net.sh
index bde1de727..97860c9c6 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -150,7 +150,7 @@ startLeader() {
     esac
 
     ssh "${sshOptions[@]}" -n "$ipAddress" \
-      "./solana/net/remote/remote_node.sh $deployMethod leader $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\""
+      "./solana/net/remote/remote-node.sh $deployMethod leader $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\""
   ) >> "$logFile" 2>&1
 }
 
@@ -163,7 +163,7 @@ startValidator() {
     common_start_setup "$ipAddress" /dev/stdout
     set -x
     ssh "${sshOptions[@]}" -n "$ipAddress" \
-      "./solana/net/remote/remote_node.sh $deployMethod validator $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\""
+      "./solana/net/remote/remote-node.sh $deployMethod validator $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\""
   ) >> "$netLogDir/validator-$ipAddress.log" 2>&1 &
   declare pid=$!
   ln -sfT "validator-$ipAddress.log" "$netLogDir/validator-$pid.log"
@@ -179,7 +179,7 @@ startClient() {
   (
     set -x
     ssh "${sshOptions[@]}" -f "$ipAddress" \
-      "./solana/net/remote/remote_client.sh $deployMethod $leaderIp $expectedNodeCount \"$RUST_LOG\""
+      "./solana/net/remote/remote-client.sh $deployMethod $leaderIp $expectedNodeCount \"$RUST_LOG\""
   ) >> "$logFile" 2>&1
 }
 
@@ -188,9 +188,9 @@ sanity() {
   echo "--- Sanity"
   (
     set -x
-    # shellcheck disable=SC2029 # remote_client.sh args are expanded on client side intentionally
+    # shellcheck disable=SC2029 # remote-client.sh args are expanded on client side intentionally
     ssh "${sshOptions[@]}" "$leaderIp" \
-      "./solana/net/remote/remote_sanity.sh $sanityExtraArgs"
+      "./solana/net/remote/remote-sanity.sh $sanityExtraArgs"
   )
 }
 
@@ -293,7 +293,7 @@ stop_node() {
         sudo snap set solana mode=;
         sudo snap remove solana;
       fi;
-      for pattern in solana- remote_ oom-monitor; do pkill -9 \$pattern; done;
+      for pattern in solana- remote- oom-monitor; do pkill -9 \$pattern; done;
     "
   ) || true
 }
diff --git a/net/remote/remote_client.sh b/net/remote/remote-client.sh
similarity index 100%
rename from net/remote/remote_client.sh
rename to net/remote/remote-client.sh
diff --git a/net/remote/remote_node.sh b/net/remote/remote-node.sh
similarity index 100%
rename from net/remote/remote_node.sh
rename to net/remote/remote-node.sh
diff --git a/net/remote/remote_sanity.sh b/net/remote/remote-sanity.sh
similarity index 100%
rename from net/remote/remote_sanity.sh
rename to net/remote/remote-sanity.sh
diff --git a/net/remote/remote_startup.sh b/net/remote/remote-startup.sh
similarity index 100%
rename from net/remote/remote_startup.sh
rename to net/remote/remote-startup.sh