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/update.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-COINCURVE=0.2
 
 echo "Updating BasicSwapDEX" && sleep 1
 # Delete dangling build folder. Same as --no-cache for docker
@@ -9,10 +8,14 @@ rm -rf $SWAP_DATADIR/basicswap/build
 # 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 .
 

install.sh

@@ -184,7 +184,7 @@ 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)
+trasherdk=$(echo $PATH | grep -F '.local/bin')
 
 if [[ ! -d $HOME/.local/bin ]]; then
     mkdir -p $HOME/.local/bin