From 3f7f492cc016a647a7d1b71a854e3478c71e42d6 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 14 Jul 2018 00:12:25 -0700
Subject: [PATCH] Fix snap client-demo fixes

---
 multinode-demo/common.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index 8255997ece..ebe9668bd5 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -7,16 +7,9 @@ rsync=rsync
 if [[ -d "$SNAP" ]]; then # Running inside a Linux Snap?
   solana_program() {
     declare program="$1"
-    if [[ "$program" = wallet ]]; then
-      # TODO: Merge wallet.sh functionality into solana-wallet proper and
-      #       remove this special case
-      printf "%s/bin/solana-%s" "$SNAP" "$program"
-    else
-      printf "%s/command-%s.wrapper" "$SNAP" "$program"
-    fi
-    if [[ "$program" = client-demo ]]; then
-      # TODO: Merge client.sh functionality into solana-client-demo proper and
-      #       remove this special case
+    if [[ "$program" = wallet || "$program" = client-demo ]]; then
+      # TODO: Merge wallet.sh/client.sh functionality into
+      #       solana-wallet/solana-demo-client proper and remove this special case
       printf "%s/bin/solana-%s" "$SNAP" "$program"
     else
       printf "%s/command-%s.wrapper" "$SNAP" "$program"