From 4752bd4f43a3e56313d1f63b6ae3481f2f0ed111 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Thu, 14 Sep 2023 23:28:44 +0300
Subject: [PATCH] Edit INSTALL.md, - update binary links

---
 INSTALL.md | 51 +++++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index f4aefbed..7942a957 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,40 +1,46 @@
 # PyBitmessage Installation Instructions
-- Binary (no separate installation of dependencies required)
-    - windows (32bit only): https://download.bitmessage.org/snapshots/
-    - linux (64bit): https://appimage.bitmessage.org/releases/
-    - mac (64bit, not up to date): https://github.com/Bitmessage/PyBitmessage/releases/tag/v0.6.3
+- Binary (64bit, no separate installation of dependencies required)
+    - Windows: https://download.bitmessage.org/snapshots/
+    - Linux AppImages: https://artifacts.bitmessage.at/appimage/
+	- Linux snaps: https://artifacts.bitmessage.at/snap/
+    - Mac (not up to date): https://github.com/Bitmessage/PyBitmessage/releases/tag/v0.6.1
 - Source
-    git clone git://github.com/Bitmessage/PyBitmessage.git
+    `git clone git://github.com/Bitmessage/PyBitmessage.git`
 
 ## Helper Script for building from source
 Go to the directory with PyBitmessage source code and run:
 ```
 python checkdeps.py
 ```
-If there are missing dependencies, it will explain you what is missing and for many Unix-like systems also what you have to do to resolve it. You need to repeat calling the script until you get nothing mandatory missing. How you then run setuptools depends on whether you want to install it to user's directory or system.
+If there are missing dependencies, it will explain you what is missing
+and for many Unix-like systems also what you have to do to resolve it. You need
+to repeat calling the script until you get nothing mandatory missing. How you
+then run setuptools depends on whether you want to install it to
+user's directory or system.
 
 ### If checkdeps fails, then verify manually which dependencies are missing from below
 Before running PyBitmessage, make sure you have all the necessary dependencies
 installed on your system.
 
-These dependencies may not be available on a recent OS and PyBitmessage may not build on such systems.
-Here's a list of dependencies needed for PyBitmessage based on operating system
+These dependencies may not be available on a recent OS and PyBitmessage may not
+build on such systems. Here's a list of dependencies needed for PyBitmessage
+based on operating system
 
 For Debian-based (Ubuntu, Raspbian, PiBang, others)
 ```
-python2.7 openssl libssl-dev git python-msgpack python-qt4 python-six
+python2.7 openssl libssl-dev python-msgpack python-qt4 python-six
 ```
 For Arch Linux
 ```
-python2 openssl git python2-pyqt4 python-six
+python2 openssl python2-pyqt4 python-six
 ```
 For Fedora
 ```
-python python-qt4 git openssl-compat-bitcoin-libs python-six
+python python-qt4 openssl-compat-bitcoin-libs python-six
 ```
 For Red Hat Enterprise Linux (RHEL)
 ```
-python python-qt4 git openssl-compat-bitcoin-libs python-six
+python python-qt4 openssl-compat-bitcoin-libs python-six
 ```
 For GNU Guix
 ```
@@ -42,9 +48,10 @@ python2-msgpack python2-pyqt@4.11.4 python2-sip openssl python-six
 ```
 
 ## setuptools
-This is now the recommended and in most cases the easiest procedure for installing PyBitmessage. 
+This is now the recommended and in most cases the easiest way for
+installing PyBitmessage.
 
-There are 3 options for running setuptools: root, user, venv
+There are 2 options for installing with setuptools: root and user.
 
 ### as root:
 ```
@@ -58,7 +65,7 @@ python setup.py install --user
 ~/.local/bin/pybitmessage
 ```
 
-### as venv:
+## pip venv (daemon):
 Create virtualenv with Python 2.x version
 ```
 virtualenv -p python2 env
@@ -69,19 +76,11 @@ Activate env
 source env/bin/activate
 ```
 
-Install requirements.txt
-```
-pip install -r requirements.txt
-```
-
 Build & run pybitmessage
 ```
-python setup.py install
-pybitmessage
+pip install .
+pybitmessage -d
 ```
 
 ## Alternative way to run PyBitmessage, without setuptools (this isn't recommended)
-run `src/bitmessagemain.py`.
-```
-cd PyBitmessage/ && python src/bitmessagemain.py
-```
+run `./start.sh`.