From 79f1d3bd0e8dc6beb799462e87218ffb8c7196c6 Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Wed, 28 Jun 2017 14:01:12 +0200 Subject: [PATCH 1/2] Update README.md Update Debian and Ubuntu installation instructions --- README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8d5ddc5..37ecfbb 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,15 @@ Received file written to README.md Or on macOS with `homebrew`: `$ brew install magic-wormhole` -On Debian/Ubuntu systems, you may first need `apt-get install python-pip -build-essential python-dev libffi-dev libssl-dev`. On Fedora it's `dnf -install python-pip python-devel libffi-devel openssl-devel gcc-c++ -libtool redhat-rpm-config`. On OS-X, you may need to install `pip` and -run `xcode-select --install` to get GCC. On Windows, python2 may work -better than python3. On older systems, `pip install --upgrade pip` may +Or on Debian 9 and Ubuntu 17.04+ with `apt`: +```$ sudo apt install magic-wormhole``` + +On previous versions of the Debian/Ubuntu systems, you may first need `apt-get +install python-pip build-essential python-dev libffi-dev libssl-dev` before +running `pip`. On Fedora it's `dnf install python-pip python-devel libffi-devel +openssl-devel gcc-c++ libtool redhat-rpm-config`. On OS-X, you may need to +install `pip` and run `xcode-select --install` to get GCC. On Windows, python2 +may work better than python3. On older systems, `pip install --upgrade pip` may be necessary to get a version that can compile all the dependencies. If you get errors like `fatal error: sodium.h: No such file or directory` on From 1ed3ab003edaa75660504c2332fdfe34616231ac Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 29 Jun 2017 07:50:10 -0700 Subject: [PATCH 2/2] README: more updates --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 37ecfbb..5a15813 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,14 @@ Or on macOS with `homebrew`: `$ brew install magic-wormhole` Or on Debian 9 and Ubuntu 17.04+ with `apt`: ```$ sudo apt install magic-wormhole``` -On previous versions of the Debian/Ubuntu systems, you may first need `apt-get -install python-pip build-essential python-dev libffi-dev libssl-dev` before -running `pip`. On Fedora it's `dnf install python-pip python-devel libffi-devel -openssl-devel gcc-c++ libtool redhat-rpm-config`. On OS-X, you may need to -install `pip` and run `xcode-select --install` to get GCC. On Windows, python2 -may work better than python3. On older systems, `pip install --upgrade pip` may -be necessary to get a version that can compile all the dependencies. +On previous versions of the Debian/Ubuntu systems, or if you want to install +the latest version, you may first need `apt-get install python-pip +build-essential python-dev libffi-dev libssl-dev` before running `pip`. On +Fedora it's `dnf install python-pip python-devel libffi-devel openssl-devel +gcc-c++ libtool redhat-rpm-config`. On OS-X, you may need to install `pip` +and run `xcode-select --install` to get GCC. On Windows, python2 may work +better than python3. On older systems, `pip install --upgrade pip` may be +necessary to get a version that can compile all the dependencies. If you get errors like `fatal error: sodium.h: No such file or directory` on Linux, either use `SODIUM_INSTALL=bundled pip install magic-wormhole`, or try