use coincurve tags

README.md

@@ -4,14 +4,14 @@ BasicSwapDEX on Windows(WSL)/Debian/Ubuntu/Arch/Fedora
 
 ### New Installation
 ```bash
-git clone https://github.com/nahuhh/basicswap-bash
+git clone https://github.com/nahuhh/basicswap-bash -b dev
 cd basicswap-bash && ./install.sh
 cd .. && rm -rf basicswap-bash
 ```
 ### Update scripts from older versions
 ``` bash
 cd ~/coinswaps/basicswap
-git clone https://github.com/nahuhh/basicswap-bash
+git clone https://github.com/nahuhh/basicswap-bash -b dev
 cd basicswap-bash
 mkdir -p $HOME/.local/bin
 rm -r $HOME/.local/bin/bsx

bsx/setup.sh

@@ -7,10 +7,8 @@ nocolor="echo -e -n \e[0m"
 
 ## Download & Install coincurve stuff
 cd $SWAP_DATADIR
-wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip
+git clone https://github.com/basicswap/coincurve -b basicswap_v0.2 coincurve-basicswap
-unzip -d coincurve-anonswap coincurve-anonswap.zip
+cd $SWAP_DATADIR/coincurve-basicswap
-mv -f ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true
-cd $SWAP_DATADIR/coincurve-anonswap
 $SWAP_DATADIR/venv/bin/pip install .
 
 ## Clone basicswap git
@@ -18,6 +16,7 @@ cd $SWAP_DATADIR
 git clone https://github.com/basicswap/basicswap
 cd $SWAP_DATADIR/basicswap
 ## Install basicswap
+$SWAP_DATADIR/venv/bin/pip install wheel
 $SWAP_DATADIR/venv/bin/pip install .
 
 ## Decide a source for Monero's restore height
@@ -63,4 +62,5 @@ else
 	enable_tor
 fi
 
-$green"Install complete.\n\nUse 'basicswap-bash' to run, 'bsx-update' to update, and 'bsx-addcoin' to add a coin\n"; $nocolor
+$green"Install complete.\n\nUse 'basicswap-bash' to run, 'bsx-update' to update, and 'bsx-addcoin' to add a coin\n\nYou'll need to open a new login shell (a new terminal window) for the start scripts to be recognized.\n";$nocolor
+$red"XFCE will require you to logout / login";$nocolor

bsx/update.sh

@@ -30,4 +30,4 @@ $SWAP_DATADIR/venv/bin/pip install .
 $HOME/.local/bin/bsx/auto_coinupd8.sh
 
 # Cleanup
-rm -rf basicswap-bash core_versions
+rm -rf basicswap-bash

core_versions

@@ -5,5 +5,5 @@ Firo Core Daemon version v0.14.14.0-ge0c423805
 Litecoin Core version v0.21.3
 Particl Core version v23.2.7.0
 PIVX Core Daemon version v5.6.1.0-af60f19642
-Monero 'Fluorine Fermi' (v0.18.3.4-release)
+Monero 'Fluorine Fermi' (v0.18.3.5-release)
 Wownero 'Kunty Karen' (v0.11.1.0-release)

install.sh

@@ -79,9 +79,9 @@ detect_os_arch
 
 ## Update & Install dependencies
 echo -e "\n\nInstalling dependencies\nPress CTRL-C at password prompt(s) to skip. If skipped, you must install the dependencies manually before proceeding"
-$green"$UPDATE\n$INSTALL $DEPENDENCY git curl wget unzip automake libtool jq\n"; $nocolor
+$green"$UPDATE\n$INSTALL $DEPENDENCY curl automake libtool jq\n"; $nocolor
 $UPDATE
-$INSTALL $DEPENDENCY git curl wget unzip automake libtool jq
+$INSTALL $DEPENDENCY curl automake libtool jq
 
 # Enable tor
 echo -e "\n\n[1] Tor ON (requires sudo)\n[2] Tor OFF\n"