update: add fix for updates from v0.12.7

README.md

@@ -24,7 +24,7 @@ bsx-update
 ```
 basicswap-bash
 ```
-#### Update BSX core
+#### Update BSX core and Coin cores
 ```
 bsx-update
 ```
@@ -45,11 +45,6 @@ bsx-addcoin
 bsx-removecoin
 ```
 
-#### Update blockchains
-```
-bsx-upgrade-coins
-```
-
 
 A small donation goes a long way. Thanks
 - ofrnxmr

bsx-addcoin

@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/addcoin.sh

bsx-disabletor

@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/disabletor.sh

bsx-enabletor

@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/enabletor.sh

bsx-removecoin

@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/removecoin.sh

bsx-update

@@ -18,7 +18,7 @@ if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
     fi
 fi
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 
 if [ -f /usr/local/bin/bsx/update.sh ]; then
 	/usr/local/bin/bsx/update.sh

bsx/setup.sh

@@ -5,22 +5,18 @@ red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
-## Download & Install coincurve stuff
-cd $SWAP_DATADIR
-git clone https://github.com/basicswap/coincurve -b basicswap_v0.2 coincurve-basicswap
-cd $SWAP_DATADIR/coincurve-basicswap
-$SWAP_DATADIR/venv/bin/pip install .
-
 ## Clone basicswap git
 cd $SWAP_DATADIR
 git clone https://github.com/basicswap/basicswap
 cd $SWAP_DATADIR/basicswap
+
 ## Macos
 if [[ $MACOS ]]; then
     $SWAP_DATADIR/venv/bin/pip install certifi
 fi
-## Install basicswap
-$SWAP_DATADIR/venv/bin/pip install wheel
+
+## Install basicswap, coincurve, and pip dependencies
+$SWAP_DATADIR/venv/bin/pip install -r requirements.txt --require-hashes
 $SWAP_DATADIR/venv/bin/pip install .
 
 ## Decide a source for Monero's restore height

bsx/update.sh

@@ -1,29 +1,22 @@
 #!/bin/bash
-COINCURVE=0.2
 
 echo "Updating BasicSwapDEX" && sleep 1
 # Delete dangling build folder. Same as --no-cache for docker
 rm -rf $SWAP_DATADIR/basicswap/build
 
-# Coincurve
-cd $SWAP_DATADIR
-if [[ -d coincurve-basicswap ]]; then
-    cd coincurve-basicswap
-    git fetch
-    git checkout basicswap_v$COINCURVE
-else
-    git clone https://github.com/basicswap/coincurve -b basicswap_v$COINCURVE coincurve-basicswap && cd $_
-fi
-$SWAP_DATADIR/venv/bin/pip install .
-
-# BasicSwap
+# BasicSwap, coincurve, and dependencies
 # Switch to new repo: basicswap/basicswap
 cd $SWAP_DATADIR/basicswap
 git remote set-url origin https://github.com/basicswap/basicswap
-# git checkout master
-git pull
 
-# Update BasicSwap
+# Conflicting messages_pb2.py from v0.12.7
+if [[ -f basicswap/messages_pb2.py ]]; then
+    git restore basicswap/messages_pb2.py
+fi
+
+#git checkout master
+git pull
+$SWAP_DATADIR/venv/bin/pip install -r requirements.txt --require-hashes
 $SWAP_DATADIR/venv/bin/pip install .
 
 # Update Coin Cores

install.sh

@@ -50,7 +50,7 @@ detect_os_arch() {
         # Debian / Ubuntu / Mint
         INSTALL="sudo apt install"
         UPDATE="sudo apt update"
-        DEPENDENCY="python-is-python3 python3-pip python3-venv gnupg pkg-config"
+        DEPENDENCY="python3-pip python3-venv gnupg pkg-config"
     elif type -P dnf > /dev/null; then
         # Fedora
         INSTALL="sudo dnf install"
@@ -184,9 +184,13 @@ read -p 'Press Enter to continue, or CTRL-C to exit.'
 
 # Quest to make trasher happy
 addpath='PATH="$HOME/.local/bin:$PATH"'
-trasherdk=$(echo $PATH | grep .local/bin)
-if ! [[ $trasherdk ]]; then
+trasherdk=$(echo $PATH | grep -F '.local/bin')
+
+if [[ ! -d $HOME/.local/bin ]]; then
     mkdir -p $HOME/.local/bin
+fi
+
+if [[ -z $trasherdk ]]; then
 
     # Bash
     if [[ -f $HOME/.bashrc ]]; then