From 92c3e26c7ae73c21ef958d89d4e48a5402f82cb8 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 7 Dec 2018 10:00:35 -0800
Subject: [PATCH] Flip symlinks

---
 multinode-demo/bootstrap-leader.sh |  44 ++++++-
 multinode-demo/fullnode-x.sh       |   9 +-
 multinode-demo/fullnode.sh         | 181 ++++++++++++++++++++++++++++-
 multinode-demo/leader.sh           |  44 +------
 multinode-demo/validator-x.sh      |   9 +-
 multinode-demo/validator.sh        | 181 +----------------------------
 6 files changed, 234 insertions(+), 234 deletions(-)
 mode change 120000 => 100755 multinode-demo/bootstrap-leader.sh
 mode change 120000 => 100755 multinode-demo/fullnode-x.sh
 mode change 120000 => 100755 multinode-demo/fullnode.sh
 mode change 100755 => 120000 multinode-demo/leader.sh
 mode change 100755 => 120000 multinode-demo/validator-x.sh
 mode change 100755 => 120000 multinode-demo/validator.sh

diff --git a/multinode-demo/bootstrap-leader.sh b/multinode-demo/bootstrap-leader.sh
deleted file mode 120000
index 54051b52a..000000000
--- a/multinode-demo/bootstrap-leader.sh
+++ /dev/null
@@ -1 +0,0 @@
-leader.sh
\ No newline at end of file
diff --git a/multinode-demo/bootstrap-leader.sh b/multinode-demo/bootstrap-leader.sh
new file mode 100755
index 000000000..44c9d750e
--- /dev/null
+++ b/multinode-demo/bootstrap-leader.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+#
+# Start the bootstrap leader node
+#
+
+here=$(dirname "$0")
+# shellcheck source=multinode-demo/common.sh
+source "$here"/common.sh
+
+# shellcheck source=scripts/oom-score-adj.sh
+source "$here"/../scripts/oom-score-adj.sh
+
+if [[ -d "$SNAP" ]]; then
+  # Exit if mode is not yet configured
+  # (typically the case after the Snap is first installed)
+  [[ -n "$(snapctl get mode)" ]] || exit 0
+fi
+
+[[ -f "$SOLANA_CONFIG_DIR"/bootstrap-leader.json ]] || {
+  echo "$SOLANA_CONFIG_DIR/bootstrap-leader.json not found, create it by running:"
+  echo
+  echo "  ${here}/setup.sh"
+  exit 1
+}
+
+if [[ -n "$SOLANA_CUDA" ]]; then
+  program="$solana_fullnode_cuda"
+else
+  program="$solana_fullnode"
+fi
+
+tune_networking
+
+trap 'kill "$pid" && wait "$pid"' INT TERM
+$program \
+  --no-leader-rotation \
+  --identity "$SOLANA_CONFIG_DIR"/bootstrap-leader.json \
+  --ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger \
+  --rpc 8899 \
+  > >($bootstrap_leader_logger) 2>&1 &
+pid=$!
+oom_score_adj "$pid" 1000
+wait "$pid"
diff --git a/multinode-demo/fullnode-x.sh b/multinode-demo/fullnode-x.sh
deleted file mode 120000
index 9df039a0e..000000000
--- a/multinode-demo/fullnode-x.sh
+++ /dev/null
@@ -1 +0,0 @@
-validator-x.sh
\ No newline at end of file
diff --git a/multinode-demo/fullnode-x.sh b/multinode-demo/fullnode-x.sh
new file mode 100755
index 000000000..919c8441e
--- /dev/null
+++ b/multinode-demo/fullnode-x.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#
+# Start a dynamically-configured full node
+#
+
+here=$(dirname "$0")
+
+exec "$here"/fullnode.sh -x "$@"
diff --git a/multinode-demo/fullnode.sh b/multinode-demo/fullnode.sh
deleted file mode 120000
index 863dc8d9f..000000000
--- a/multinode-demo/fullnode.sh
+++ /dev/null
@@ -1 +0,0 @@
-validator.sh
\ No newline at end of file
diff --git a/multinode-demo/fullnode.sh b/multinode-demo/fullnode.sh
new file mode 100755
index 000000000..4bd32b9e7
--- /dev/null
+++ b/multinode-demo/fullnode.sh
@@ -0,0 +1,180 @@
+#!/usr/bin/env bash
+#
+# Start a full node
+#
+here=$(dirname "$0")
+# shellcheck source=multinode-demo/common.sh
+source "$here"/common.sh
+
+# shellcheck source=scripts/oom-score-adj.sh
+source "$here"/../scripts/oom-score-adj.sh
+
+if [[ -d "$SNAP" ]]; then
+  # Exit if mode is not yet configured
+  # (typically the case after the Snap is first installed)
+  [[ -n "$(snapctl get mode)" ]] || exit 0
+fi
+
+usage() {
+  if [[ -n $1 ]]; then
+    echo "$*"
+    echo
+  fi
+  echo "usage: $0 [-x] [rsync network path to bootstrap leader configuration] [network entry point]"
+  echo
+  echo " Start a full node on the specified network"
+  echo
+  echo "   -x: runs a new, dynamically-configured full node"
+  echo
+  exit 1
+}
+
+if [[ $1 = -h ]]; then
+  usage
+fi
+
+if [[ $1 == -x ]]; then
+  self_setup=1
+  shift
+else
+  self_setup=0
+fi
+
+if [[ -n $3 ]]; then
+  usage
+fi
+
+find_leader() {
+  declare leader leader_address
+  declare shift=0
+
+  if [[ -d $SNAP ]]; then
+    if [[ -n $1 ]]; then
+      usage "Error: unexpected parameter: $1"
+    fi
+
+    # Select leader from the Snap configuration
+    leader_ip=$(snapctl get entrypoint-ip)
+    if [[ -z $leader_ip ]]; then
+      leader=testnet.solana.com
+      leader_ip=$(dig +short "${leader%:*}" | head -n1)
+      if [[ -z $leader_ip ]]; then
+          usage "Error: unable to resolve IP address for $leader"
+      fi
+    fi
+    leader=$leader_ip
+    leader_address=$leader_ip:8001
+  else
+    if [[ -z $1 ]]; then
+      leader=${here}/..        # Default to local tree for rsync
+      leader_address=127.0.0.1:8001 # Default to local leader
+    elif [[ -z $2 ]]; then
+      leader=$1
+
+      declare leader_ip
+      leader_ip=$(dig +short "${leader%:*}" | head -n1)
+
+      if [[ -z $leader_ip ]]; then
+          usage "Error: unable to resolve IP address for $leader"
+      fi
+
+      leader_address=$leader_ip:8001
+      shift=1
+    else
+      leader=$1
+      leader_address=$2
+      shift=2
+    fi
+  fi
+
+  echo "$leader" "$leader_address" "$shift"
+}
+
+read -r leader leader_address shift < <(find_leader "${@:1:2}")
+shift "$shift"
+
+if [[ -n $SOLANA_CUDA ]]; then
+  program=$solana_fullnode_cuda
+else
+  program=$solana_fullnode
+fi
+
+if ((!self_setup)); then
+  [[ -f $SOLANA_CONFIG_DIR/fullnode.json ]] || {
+    echo "$SOLANA_CONFIG_DIR/fullnode.json not found, create it by running:"
+    echo
+    echo "  ${here}/setup.sh"
+    exit 1
+  }
+  fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id.json
+  fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode.json
+  ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger
+else
+  mkdir -p "$SOLANA_CONFIG_DIR"
+  fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id-x$$.json
+  $solana_keygen -o "$fullnode_id_path"
+
+  mkdir -p "$SOLANA_CONFIG_DIR"
+  fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode-x$$.json
+
+  port=9000
+  (((port += ($$ % 1000)) && (port == 9000) && port++))
+
+  $solana_fullnode_config --keypair="$fullnode_id_path" -l -b "$port" > "$fullnode_json_path"
+
+  ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger-x$$
+fi
+
+[[ -r $fullnode_id_path ]] || {
+  echo "$fullnode_id_path does not exist"
+  exit 1
+}
+
+rsync_url() { # adds the 'rsync://` prefix to URLs that need it
+  declare url="$1"
+
+  if [[ $url =~ ^.*:.*$ ]]; then
+    # assume remote-shell transport when colon is present, use $url unmodified
+    echo "$url"
+    return 0
+  fi
+
+  if [[ -d $url ]]; then
+    # assume local directory if $url is a valid directory, use $url unmodified
+    echo "$url"
+    return 0
+  fi
+
+  # Default to rsync:// URL
+  echo "rsync://$url"
+}
+
+rsync_leader_url=$(rsync_url "$leader")
+
+tune_networking
+
+set -ex
+$rsync -vPr "$rsync_leader_url"/config/ "$ledger_config_dir"
+[[ -d $ledger_config_dir/ledger ]] || {
+  echo "Unable to retrieve ledger from $rsync_leader_url"
+  exit 1
+}
+
+# A fullnode requires 2 tokens to function:
+# - one token to create an instance of the vote_program with
+# - one second token to keep the node identity public key valid.
+$solana_wallet \
+  --keypair "$fullnode_id_path" \
+  --network "$leader_address" \
+  airdrop 2
+
+trap 'kill "$pid" && wait "$pid"' INT TERM
+$program \
+  --no-leader-rotation \
+  --identity "$fullnode_json_path" \
+  --network "$leader_address" \
+  --ledger "$ledger_config_dir"/ledger \
+  > >($fullnode_logger) 2>&1 &
+pid=$!
+oom_score_adj "$pid" 1000
+wait "$pid"
diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh
deleted file mode 100755
index 44c9d750e..000000000
--- a/multinode-demo/leader.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-#
-# Start the bootstrap leader node
-#
-
-here=$(dirname "$0")
-# shellcheck source=multinode-demo/common.sh
-source "$here"/common.sh
-
-# shellcheck source=scripts/oom-score-adj.sh
-source "$here"/../scripts/oom-score-adj.sh
-
-if [[ -d "$SNAP" ]]; then
-  # Exit if mode is not yet configured
-  # (typically the case after the Snap is first installed)
-  [[ -n "$(snapctl get mode)" ]] || exit 0
-fi
-
-[[ -f "$SOLANA_CONFIG_DIR"/bootstrap-leader.json ]] || {
-  echo "$SOLANA_CONFIG_DIR/bootstrap-leader.json not found, create it by running:"
-  echo
-  echo "  ${here}/setup.sh"
-  exit 1
-}
-
-if [[ -n "$SOLANA_CUDA" ]]; then
-  program="$solana_fullnode_cuda"
-else
-  program="$solana_fullnode"
-fi
-
-tune_networking
-
-trap 'kill "$pid" && wait "$pid"' INT TERM
-$program \
-  --no-leader-rotation \
-  --identity "$SOLANA_CONFIG_DIR"/bootstrap-leader.json \
-  --ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger \
-  --rpc 8899 \
-  > >($bootstrap_leader_logger) 2>&1 &
-pid=$!
-oom_score_adj "$pid" 1000
-wait "$pid"
diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh
new file mode 120000
index 000000000..86bcd2c1e
--- /dev/null
+++ b/multinode-demo/leader.sh
@@ -0,0 +1 @@
+bootstrap-leader.sh
\ No newline at end of file
diff --git a/multinode-demo/validator-x.sh b/multinode-demo/validator-x.sh
deleted file mode 100755
index 919c8441e..000000000
--- a/multinode-demo/validator-x.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-#
-# Start a dynamically-configured full node
-#
-
-here=$(dirname "$0")
-
-exec "$here"/fullnode.sh -x "$@"
diff --git a/multinode-demo/validator-x.sh b/multinode-demo/validator-x.sh
new file mode 120000
index 000000000..da88ce31c
--- /dev/null
+++ b/multinode-demo/validator-x.sh
@@ -0,0 +1 @@
+fullnode-x.sh
\ No newline at end of file
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
deleted file mode 100755
index 4bd32b9e7..000000000
--- a/multinode-demo/validator.sh
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env bash
-#
-# Start a full node
-#
-here=$(dirname "$0")
-# shellcheck source=multinode-demo/common.sh
-source "$here"/common.sh
-
-# shellcheck source=scripts/oom-score-adj.sh
-source "$here"/../scripts/oom-score-adj.sh
-
-if [[ -d "$SNAP" ]]; then
-  # Exit if mode is not yet configured
-  # (typically the case after the Snap is first installed)
-  [[ -n "$(snapctl get mode)" ]] || exit 0
-fi
-
-usage() {
-  if [[ -n $1 ]]; then
-    echo "$*"
-    echo
-  fi
-  echo "usage: $0 [-x] [rsync network path to bootstrap leader configuration] [network entry point]"
-  echo
-  echo " Start a full node on the specified network"
-  echo
-  echo "   -x: runs a new, dynamically-configured full node"
-  echo
-  exit 1
-}
-
-if [[ $1 = -h ]]; then
-  usage
-fi
-
-if [[ $1 == -x ]]; then
-  self_setup=1
-  shift
-else
-  self_setup=0
-fi
-
-if [[ -n $3 ]]; then
-  usage
-fi
-
-find_leader() {
-  declare leader leader_address
-  declare shift=0
-
-  if [[ -d $SNAP ]]; then
-    if [[ -n $1 ]]; then
-      usage "Error: unexpected parameter: $1"
-    fi
-
-    # Select leader from the Snap configuration
-    leader_ip=$(snapctl get entrypoint-ip)
-    if [[ -z $leader_ip ]]; then
-      leader=testnet.solana.com
-      leader_ip=$(dig +short "${leader%:*}" | head -n1)
-      if [[ -z $leader_ip ]]; then
-          usage "Error: unable to resolve IP address for $leader"
-      fi
-    fi
-    leader=$leader_ip
-    leader_address=$leader_ip:8001
-  else
-    if [[ -z $1 ]]; then
-      leader=${here}/..        # Default to local tree for rsync
-      leader_address=127.0.0.1:8001 # Default to local leader
-    elif [[ -z $2 ]]; then
-      leader=$1
-
-      declare leader_ip
-      leader_ip=$(dig +short "${leader%:*}" | head -n1)
-
-      if [[ -z $leader_ip ]]; then
-          usage "Error: unable to resolve IP address for $leader"
-      fi
-
-      leader_address=$leader_ip:8001
-      shift=1
-    else
-      leader=$1
-      leader_address=$2
-      shift=2
-    fi
-  fi
-
-  echo "$leader" "$leader_address" "$shift"
-}
-
-read -r leader leader_address shift < <(find_leader "${@:1:2}")
-shift "$shift"
-
-if [[ -n $SOLANA_CUDA ]]; then
-  program=$solana_fullnode_cuda
-else
-  program=$solana_fullnode
-fi
-
-if ((!self_setup)); then
-  [[ -f $SOLANA_CONFIG_DIR/fullnode.json ]] || {
-    echo "$SOLANA_CONFIG_DIR/fullnode.json not found, create it by running:"
-    echo
-    echo "  ${here}/setup.sh"
-    exit 1
-  }
-  fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id.json
-  fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode.json
-  ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger
-else
-  mkdir -p "$SOLANA_CONFIG_DIR"
-  fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id-x$$.json
-  $solana_keygen -o "$fullnode_id_path"
-
-  mkdir -p "$SOLANA_CONFIG_DIR"
-  fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode-x$$.json
-
-  port=9000
-  (((port += ($$ % 1000)) && (port == 9000) && port++))
-
-  $solana_fullnode_config --keypair="$fullnode_id_path" -l -b "$port" > "$fullnode_json_path"
-
-  ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger-x$$
-fi
-
-[[ -r $fullnode_id_path ]] || {
-  echo "$fullnode_id_path does not exist"
-  exit 1
-}
-
-rsync_url() { # adds the 'rsync://` prefix to URLs that need it
-  declare url="$1"
-
-  if [[ $url =~ ^.*:.*$ ]]; then
-    # assume remote-shell transport when colon is present, use $url unmodified
-    echo "$url"
-    return 0
-  fi
-
-  if [[ -d $url ]]; then
-    # assume local directory if $url is a valid directory, use $url unmodified
-    echo "$url"
-    return 0
-  fi
-
-  # Default to rsync:// URL
-  echo "rsync://$url"
-}
-
-rsync_leader_url=$(rsync_url "$leader")
-
-tune_networking
-
-set -ex
-$rsync -vPr "$rsync_leader_url"/config/ "$ledger_config_dir"
-[[ -d $ledger_config_dir/ledger ]] || {
-  echo "Unable to retrieve ledger from $rsync_leader_url"
-  exit 1
-}
-
-# A fullnode requires 2 tokens to function:
-# - one token to create an instance of the vote_program with
-# - one second token to keep the node identity public key valid.
-$solana_wallet \
-  --keypair "$fullnode_id_path" \
-  --network "$leader_address" \
-  airdrop 2
-
-trap 'kill "$pid" && wait "$pid"' INT TERM
-$program \
-  --no-leader-rotation \
-  --identity "$fullnode_json_path" \
-  --network "$leader_address" \
-  --ledger "$ledger_config_dir"/ledger \
-  > >($fullnode_logger) 2>&1 &
-pid=$!
-oom_score_adj "$pid" 1000
-wait "$pid"
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
new file mode 120000
index 000000000..3066c639a
--- /dev/null
+++ b/multinode-demo/validator.sh
@@ -0,0 +1 @@
+fullnode.sh
\ No newline at end of file