This commit is contained in:
Rob Walker 2018-08-10 11:27:36 -07:00
parent 7f71e1e09f
commit 06af9de753
3 changed files with 6 additions and 6 deletions

View File

@ -188,10 +188,10 @@ oom_score_adj() {
fi
}
SOLANA_CONFIG_DIR=${SNAP_DATA:-~/.solana}/config
SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-~/.solana}/config-private
SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_DATA:-~/.solana}/config-validator
SOLANA_CONFIG_CLIENT_DIR=${SNAP_USER_DATA:-~/.solana}/config-client
SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private
SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_DATA:-$PWD}/config-validator
SOLANA_CONFIG_CLIENT_DIR=${SNAP_USER_DATA:-$PWD}/config-client
rsync_url() { # adds the 'rsync://` prefix to URLs that need it
declare url="$1"

View File

@ -21,7 +21,7 @@ if [[ -d "$SNAP" ]]; then
fi
leader="$leader_address"
else
leader=${1:-~/.solana} # Default to ~/.solana for data
leader=${1:-${here}/..} # Default to local tree for data
fi
[[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json ]] || {

View File

@ -43,7 +43,7 @@ if [[ -d $SNAP ]]; then
leader=$leader_address
else
if [[ -z $1 ]]; then
leader=${1:-~/.solana} # Default to ~/.solana for data
leader=${1:-${here}/..} # Default to local tree for data
leader_address=${2:-127.0.0.1} # Default to local leader
elif [[ -z $2 ]]; then
leader=$1