Set client config directory correctly in a Snap

This commit is contained in:
Michael Vines
2018-07-02 16:22:35 -07:00
parent 7d708be121
commit 263577773f
3 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@
here=$(dirname "$0") here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh # shellcheck source=multinode-demo/common.sh
source "$here"/common.sh source "$here"/common.sh
SOLANA_CONFIG_DIR=config-client SOLANA_CONFIG_DIR="$SOLANA_CONFIG_DIR"-client
leader=${1:-${here}/..} # Default to local solana repo leader=${1:-${here}/..} # Default to local solana repo
count=${2:-1} count=${2:-1}

View File

@ -6,7 +6,7 @@
here=$(dirname "$0") here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh # shellcheck source=multinode-demo/common.sh
source "$here"/common.sh source "$here"/common.sh
SOLANA_CONFIG_DIR=config-drone SOLANA_CONFIG_DIR="$SOLANA_CONFIG_DIR"-drone
if [[ -d "$SNAP" ]]; then if [[ -d "$SNAP" ]]; then
# Exit if mode is not yet configured # Exit if mode is not yet configured

View File

@ -6,7 +6,7 @@
here=$(dirname "$0") here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh # shellcheck source=multinode-demo/common.sh
source "$here"/common.sh source "$here"/common.sh
SOLANA_CONFIG_DIR=config-client SOLANA_CONFIG_DIR="$SOLANA_CONFIG_DIR"-client
# if $1 isn't host:path, something.com, or a valid local path # if $1 isn't host:path, something.com, or a valid local path
if [[ ${1%:} != "$1" || "$1" =~ [^.].[^.] || -d $1 ]]; then if [[ ${1%:} != "$1" || "$1" =~ [^.].[^.] || -d $1 ]]; then