Browse Source

formatting for MacOS instructions

master
AdamISZ 8 years ago
parent
commit
96f29cd5a4
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 2
      README.md
  2. 54
      docs/INSTALL.md

2
README.md

@ -20,7 +20,7 @@ Once you've downloaded this repo, either as a zip file, and extracted it, or via
You should now be able to run the scripts like `python wallet-tool.py` etc., just as you did in the previous Joinmarket version.
Alternative to this "quickstart": follow the [install guide](docs/INSTALL.md).
Alternative to this "quickstart" (including for MacOS): follow the [install guide](docs/INSTALL.md).
### Upgrade for segwit

54
docs/INSTALL.md

@ -67,49 +67,51 @@ command line scripts as explained in the [scripts README](https://github.com/Ada
1) Install Apple Command Line Tools
xcode-select --install
xcode-select --install
2) Install Homebrew
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
3) Install PyQt4
brew install cartr/qt4/pyqt@4 libsodium
brew install cartr/qt4/pyqt@4 libsodium
4) Create virtualenv "jmvenv"
export PATH=/usr/local/opt/python/libexec/bin:$PATH
pip install virtualenv
virtualenv --python=/usr/local/opt/python/libexec/bin/python --system-site-packages jmvenv
source jmvenv/bin/activate
```sh
export PATH=/usr/local/opt/python/libexec/bin:$PATH
pip install virtualenv
virtualenv --python=/usr/local/opt/python/libexec/bin/python --system-site-packages jmvenv
source jmvenv/bin/activate
```
At this point you should see `(jmvenv)` at the beginning of your command prompt.
5) Clone the joinmarket-clientserver repo. Follow 5a for segwit and 5b for non-segwit
5a) Segwit
5a Segwit
git clone https://github.com/Joinmarket-Org/joinmarket-clientserver
cd joinmarket-clientserver
git checkout v0.3.2
git clone https://github.com/Joinmarket-Org/joinmarket-clientserver
cd joinmarket-clientserver
git checkout v0.3.2
5b) Non-segwit
5b Non-segwit
git clone https://github.com/Joinmarket-Org/joinmarket-clientserver
cd joinmarket-clientserver
git checkout 6ad114d
6) Setup joinmarket-qt
git clone https://github.com/Joinmarket-Org/joinmarket-clientserver
cd joinmarket-clientserver
git checkout 6ad114d
python setupall.py --daemon
python setupall.py --client-bitcoin
6) Setup joinmarket-qt
```
python setupall.py --daemon
python setupall.py --client-bitcoin
```
7) Start joinmarket-qt
cd scripts
python joinmarket-qt.py
```
cd scripts
python joinmarket-qt.py
```
Alternative/custom installation:
#### Installing the daemon separately

Loading…
Cancel
Save