From 1531ba90347be190782793ff6bff9f28cf5db47f Mon Sep 17 00:00:00 2001 From: nahuhh <50635951+nahuhh@users.noreply.github.com> Date: Fri, 21 Jun 2024 20:48:18 -0500 Subject: [PATCH] wownero master --- README.md | 4 ++-- bsx/setup.sh | 2 +- bsx/update.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4cfcb66..eda3b24 100644 --- a/README.md +++ b/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 -b dev +git clone https://github.com/nahuhh/basicswap-bash 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 -b dev +git clone https://github.com/nahuhh/basicswap-bash cd basicswap-bash mkdir -p $HOME/.local/bin rm -r $HOME/.local/bin/bsx diff --git a/bsx/setup.sh b/bsx/setup.sh index 5cdf4c3..b3ba1b7 100755 --- a/bsx/setup.sh +++ b/bsx/setup.sh @@ -15,7 +15,7 @@ $SWAP_DATADIR/venv/bin/pip install . ## Clone basicswap git cd $SWAP_DATADIR -git clone https://github.com/basicswap/basicswap -b dev +git clone https://github.com/basicswap/basicswap cd $SWAP_DATADIR/basicswap ## Install basicswap $SWAP_DATADIR/venv/bin/pip install . diff --git a/bsx/update.sh b/bsx/update.sh index c92982e..cea2f21 100755 --- a/bsx/update.sh +++ b/bsx/update.sh @@ -18,7 +18,7 @@ rm -rf $SWAP_DATADIR/basicswap/build # Switch to new repo: basicswap/basicswap git remote set-url origin https://github.com/basicswap/basicswap # Fix conflicts from force-pushes and rebase -git reset HEAD~50 --hard +git checkout master # Pull repo git pull # Install