diff --git a/bsx/addcoin.sh b/bsx/addcoin.sh index 9f1140d..15b4020 100755 --- a/bsx/addcoin.sh +++ b/bsx/addcoin.sh @@ -17,11 +17,11 @@ if [ $addcoin = bitcoin ]; then if [ $confirmed = yes ]; then echo "Using btcfastsync" - basicswap-prepare --usebtcfastsync --datadir=/$SWAP_DATADIR --addcoin=$addcoin + basicswap-prepare --usebtcfastsync --datadir=$SWAP_DATADIR --addcoin=$addcoin else echo "Not using btcfastsync" - basicswap-prepare --datadir=/$SWAP_DATADIR --addcoin=$addcoin + basicswap-prepare --datadir=$SWAP_DATADIR --addcoin=$addcoin fi else - basicswap-prepare --datadir=/$SWAP_DATADIR --addcoin=$addcoin + basicswap-prepare --datadir=$SWAP_DATADIR --addcoin=$addcoin fi diff --git a/bsx/removecoin.sh b/bsx/removecoin.sh index b06da74..33f08c7 100755 --- a/bsx/removecoin.sh +++ b/bsx/removecoin.sh @@ -1,10 +1,10 @@ #!/bin/bash ## Prompt for user input -echo -e "\n\nThe following coins can be disabled (case sensitive)\nbitcoin\ndash\nfiro\nlitecoin\nparticl\nPIVX\n" +echo -e "\n\nThe following coins can be disabled (case sensitive)\nbitcoin\ndash\nfiro\nlitecoin\nmonero\npivx\n" read -p 'Full name of coin to disable [example: litecoin] ' disablecoin ## Confirm echo -e "\nDisable $disablecoin on your BasicSwap install, correct? Press any key to continue. CTRL-C to exit" read ## Disable the coin -basicswap-prepare --datadir=/$SWAP_DATADIR --disablecoin=$disablecoin +basicswap-prepare --datadir=$SWAP_DATADIR --disablecoin=$disablecoin diff --git a/bsx/setup.sh b/bsx/setup.sh index 28b9775..8f0dd94 100755 --- a/bsx/setup.sh +++ b/bsx/setup.sh @@ -42,7 +42,7 @@ if [[ "$monerod_addr" && "$particl_mnemonic" ]]; then elif [[ "$monerod_addr" ]]; then XMR_RPC_HOST=$monerod_addr BASE_XMR_RPC_PORT=$monerod_port basicswap-prepare --datadir=$SWAP_DATADIR --withcoins=monero --xmrrestoreheight=$CURRENT_XMR_HEIGHT $red"\n\nMake note of your seed above\n"; $nocolor -elif [[ "particl_mnemonic" ]]; then +elif [[ "$particl_mnemonic" ]]; then PARTICL_MNEMONIC=$particl_mnemonic basicswap-prepare --datadir=$SWAP_DATADIR --particl_mnemonic="$PARTICL_MNEMONIC" else diff --git a/install.sh b/install.sh index a1c59f1..9c3f764 100755 --- a/install.sh +++ b/install.sh @@ -82,12 +82,13 @@ read -p 'Select an option [1|2]: ' l done ## Begin Install -echo -e "\n\nShall we begin?" +echo -e "\n\nInstalling dependencies" read -p 'Press Enter to continue, or CTRL-C to exit.' ## Update & Install dependencies sudo apt update # python-is-python3 for ubuntu sudo apt install -y git wget python-is-python3 python3-venv python3-pip gnupg unzip protobuf-compiler automake libtool pkg-config curl jq # Move scripts to /usr/local/bin +sudo rm -r /usr/local/bin/bsx* /usr/local/bin/basicswap-bash sudo mv -f -t /usr/local/bin/ basicswap-bash bsx* ## Make venv and set variables for install export SWAP_DATADIR=$HOME/coinswaps