From 8676b5d40c66f05d669c1db9646edf24db953864 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 7 Jun 2019 22:18:55 -0700
Subject: [PATCH] Use more -f

---
 ci/localnet-sanity.sh       | 2 +-
 net/remote/remote-client.sh | 2 +-
 net/remote/remote-sanity.sh | 2 +-
 run.sh                      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh
index 1f2c32c045..f7d621bc96 100755
--- a/ci/localnet-sanity.sh
+++ b/ci/localnet-sanity.sh
@@ -307,7 +307,7 @@ while [[ $iteration -le $iterations ]]; do
     source multinode-demo/common.sh
     set -x
     client_keypair=/tmp/client-id.json-$$
-    $solana_keygen new -o $client_keypair || exit $?
+    $solana_keygen new -f -o $client_keypair || exit $?
     $solana_gossip spy --num-nodes-exactly $numNodes || exit $?
     rm -rf $client_keypair
   ) || flag_error
diff --git a/net/remote/remote-client.sh b/net/remote/remote-client.sh
index e9dd69228c..ecf6b9ac7e 100755
--- a/net/remote/remote-client.sh
+++ b/net/remote/remote-client.sh
@@ -65,7 +65,7 @@ solana-bench-tps)
   "
   ;;
 solana-bench-exchange)
-  solana-keygen new -o bench.keypair
+  solana-keygen new -f -o bench.keypair
   clientCommand="\
     solana-bench-exchange \
       --entrypoint $entrypointIp:8001 \
diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh
index db0fe09f12..ca38556612 100755
--- a/net/remote/remote-sanity.sh
+++ b/net/remote/remote-sanity.sh
@@ -102,7 +102,7 @@ fi
 echo "+++ $sanityTargetIp: node count ($numSanityNodes expected)"
 (
   set -x
-  $solana_keygen new -o "$client_id"
+  $solana_keygen new -f -o "$client_id"
 
   nodeArg="num-nodes"
   if $rejectExtraNodes; then
diff --git a/run.sh b/run.sh
index 5278f95c3d..91df02d0c8 100755
--- a/run.sh
+++ b/run.sh
@@ -59,8 +59,8 @@ if [[ -e $leader_stake_account_keypair ]]; then
 else
   solana-keygen new -o "$leader_stake_account_keypair"
 fi
-solana-keygen new -o "$dataDir"/drone-keypair.json
-solana-keygen new -o "$dataDir"/leader-storage-account-keypair.json
+solana-keygen new -f -o "$dataDir"/drone-keypair.json
+solana-keygen new -f -o "$dataDir"/leader-storage-account-keypair.json
 
 leaderVoteAccountPubkey=$(\
   solana-wallet \