use coincurve tags

basicswap-bash

@@ -1,5 +1,21 @@
 #!/bin/bash
 export SWAP_DATADIR=$HOME/coinswaps
-python3 -m venv "$SWAP_DATADIR/venv"
+
+# Colors
+red="echo -e -n \e[31;1m"
+green="echo -e -n \e[32;1m"
+nocolor="echo -e -n \e[0m"
+
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is already running.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 . $SWAP_DATADIR/venv/bin/activate && python -V
 $HOME/.local/bin/bsx/startup.sh

bsx-addcoin

@@ -1,10 +1,23 @@
 #!/bin/bash
+export SWAP_DATADIR=$HOME/coinswaps
 
 # Colors
 red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
+# Check if basicswap is running
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is running.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 echo -e "BasicSwapDEX is currently:\n[1] Password protected\n[2] NOT password protected\n"
 until [[ "$l" =~ ^[12]$ ]]; do
 read -p 'Select an option [1|2]: ' l
@@ -28,6 +41,6 @@ read -p 'Select an option [1|2]: ' l
                 ;;
         esac
 done
-export SWAP_DATADIR=$HOME/coinswaps
+
 . $SWAP_DATADIR/venv/bin/activate && python -V
 $HOME/.local/bin/bsx/addcoin.sh

bsx-disabletor

@@ -1,10 +1,23 @@
 #!/bin/bash
+export SWAP_DATADIR=$HOME/coinswaps
 
 # Colors
 red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
+# Check if basicswap is running
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is running.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 echo -e "BasicSwapDEX is currently:\n[1] Password protected\n[2] NOT password protected\n"
 until [[ "$l" =~ ^[12]$ ]]; do
 read -p 'Select an option [1|2]: ' l
@@ -28,6 +41,6 @@ read -p 'Select an option [1|2]: ' l
                 ;;
         esac
 done
-export SWAP_DATADIR=$HOME/coinswaps
+
 . $SWAP_DATADIR/venv/bin/activate && python -V
 $HOME/.local/bin/bsx/disabletor.sh

bsx-enabletor

@@ -1,10 +1,23 @@
 #!/bin/bash
+export SWAP_DATADIR=$HOME/coinswaps
 
 # Colors
 red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
+# Check if basicswap is running
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is running.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 echo -e "BasicSwapDEX is currently:\n[1] Password protected\n[2] NOT password protected\n"
 until [[ "$l" =~ ^[12]$ ]]; do
 read -p 'Select an option [1|2]: ' l
@@ -28,6 +41,6 @@ read -p 'Select an option [1|2]: ' l
                 ;;
         esac
 done
-export SWAP_DATADIR=$HOME/coinswaps
+
 . $SWAP_DATADIR/venv/bin/activate && python -V
 $HOME/.local/bin/bsx/enabletor.sh

bsx-removecoin

@@ -1,10 +1,23 @@
 #!/bin/bash
+export SWAP_DATADIR=$HOME/coinswaps
 
 # Colors
 red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
+# Check if basicswap is running
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is running.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 echo -e "BasicSwapDEX is currently:\n[1] Password protected\n[2] NOT password protected\n"
 until [[ "$l" =~ ^[12]$ ]]; do
 read -p 'Select an option [1|2]: ' l
@@ -28,6 +41,6 @@ read -p 'Select an option [1|2]: ' l
                 ;;
         esac
 done
-export SWAP_DATADIR=$HOME/coinswaps
+
 . $SWAP_DATADIR/venv/bin/activate && python -V
 $HOME/.local/bin/bsx/removecoin.sh

bsx-update

@@ -1,5 +1,23 @@
 #!/bin/bash
 export SWAP_DATADIR=$HOME/coinswaps
+
+# Colors
+red="echo -e -n \e[31;1m"
+green="echo -e -n \e[32;1m"
+nocolor="echo -e -n \e[0m"
+
+# Check if basicswap is running
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is running.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 . $SWAP_DATADIR/venv/bin/activate && python -V
 
 if [ -f /usr/local/bin/bsx/update.sh ]; then

bsx-upgrade-coins

@@ -1,10 +1,23 @@
 #!/bin/bash
+export SWAP_DATADIR=$HOME/coinswaps
 
 # Colors
 red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
+# Check if basicswap is running
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is running.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 echo -e "BasicSwapDEX is currently:\n[1] Password protected\n[2] NOT password protected\n"
 until [[ "$l" =~ ^[12]$ ]]; do
 read -p 'Select an option [1|2]: ' l
@@ -28,6 +41,6 @@ read -p 'Select an option [1|2]: ' l
                 ;;
         esac
 done
-export SWAP_DATADIR=$HOME/coinswaps
+
 . $SWAP_DATADIR/venv/bin/activate && python -V
 $HOME/.local/bin/bsx/upgradecoins.sh

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
-unzip -d coincurve-anonswap coincurve-anonswap.zip
-mv -f ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true
-cd $SWAP_DATADIR/coincurve-anonswap
+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
@@ -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

install.sh

@@ -1,10 +1,23 @@
 #/bin/bash
+export SWAP_DATADIR=$HOME/coinswaps
 
 # Colors
 red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
+# Check if basicswap is running
+if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
+    bsx_pid=$(cat $SWAP_DATADIR/particl/particl.pid)
+    if [[ $bsx_pid ]]; then
+        bsx_run=$(pidof particld | grep $bsx_pid)
+        if [[ $bsx_run ]]; then
+            $red"\nError: BasicSwapDEX is already installed.\n"; $nocolor
+            exit
+        fi
+    fi
+fi
+
 # Title Bar
 $green "\n"
 title="BasicSwapDEX Installer"
@@ -66,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"
@@ -169,19 +182,24 @@ if ! [[ $trasherdk ]]; then
 	mkdir -p $HOME/.local/bin
 fi
 # Move scripts to .local/bin
-if [ -d $HOME/.local/bin/bsx ]; then
+if [[ -d $HOME/.local/bin/bsx ]]; then
 	rm -r $HOME/.local/bin/bsx* $HOME/.local/bin/basicswap-bash
 fi
 mv -f -t $HOME/.local/bin/ basicswap-bash bsx*
 # Enable .profile detection on XFCE
 xfce_check=$(echo $XDG_CURRENT_DESKTOP | grep XFCE)
-xsessionrc_check=$(cat ~/.xsessionrc | grep '. ~/.profile')
-if [[ $xfce_chek ]] && [[ -z $xsessionrc_check ]]; then
-	echo '. ~/.profile' | tee -a ~/.xsessionrc
+if [[ $xfce_chek ]]; then
+    if [[ -f $HOME/.xsessionrc ]]; then
+        xsessionrc_check=$(cat ~/.xsessionrc | grep '. ~/.profile')
+        if [[ -z $xsessionrc_check ]]; then
+            echo '. ~/.profile' | tee -a ~/.xsessionrc
+        fi
+    else
+        echo '. ~/.profile' | tee -a ~/.xsessionrc
+    fi
 fi
 
 ## Make venv and set variables for install
-export SWAP_DATADIR=$HOME/coinswaps
 export monerod_addr=$monerod_addr
 export monerod_port=$monerod_port
 export particl_mnemonic=$particl_mnemonic