diff --git a/content/docs/installation/contents.lr b/content/docs/installation/contents.lr index 18f52090..0849c2e0 100644 --- a/content/docs/installation/contents.lr +++ b/content/docs/installation/contents.lr @@ -32,9 +32,9 @@ the installation is a bit more involved. You need to make sure you have the following software installed on your computer: -* Python 2.7 or above (also `python-dev`, `libssl-dev` and - `libffi-dev` is required on Ubuntu) - `sudo apt-get install python-dev libssl-dev libffi-dev` +* Python 3 is recommended (but 2.7 is also supported) + On Ubuntu `python3-dev`, `libssl-dev` and `libffi-dev` are also required + `sudo apt-get install python3-dev libssl-dev libffi-dev` * ImageMagick (`brew install imagemagick` can get you this on OS X and `sudo apt-get install imagemagick` on Ubuntu the `imagemagick` package needs to be installed. On Windows do `choco install imagemagick`, which requires [chocolatey :ext](https://chocolatey.org/), @@ -44,24 +44,30 @@ Once you have those installed and have made sure that they are on your `PATH`, y get Lektor installed with our installation script: ``` -# curl -sf https://www.getlektor.com/install.sh | sh +# curl -sf https://www.getlektor.com/installer.py | python3 ``` -If you are not logged in as superuser, instead you should try this: + +This will attempt to install lektor in your user's `HOME`. If you want a system-wide installation, try this instead: + ``` -$ curl -sf https://www.getlektor.com/install.sh | sudo sh +$ curl -sf https://www.getlektor.com/installer.py | sudo python3 ``` + If you would like to install Lektor without being prompted, set LEKTOR_SILENT before running the prior command. -For Windows you can use the `command prompt`: +For Windows you can install it directly in `Powershell`: ``` -C:\> @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1'))" && SET PATH=%PATH%;%LocalAppData%\lektor-cli +PS C:\> (new-object net.webclient).DownloadString('https://www.getlektor.com/installer.py') | python ``` -but you can also do it directly in `Powershell`: + +or you can use the `command prompt` instead: + ``` -PS C:\> iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1')) +C:\> @powershell -NoProfile -Command "(new-object net.webclient).DownloadString('https://www.getlektor.com/installer.py') | python" ``` + ## pip Alternatively you can manually install the command line version with diff --git a/content/downloads/contents.lr b/content/downloads/contents.lr index 1b6e26e7..ce42f148 100644 --- a/content/downloads/contents.lr +++ b/content/downloads/contents.lr @@ -23,16 +23,16 @@ If you are on Linux or Mac you can install the command line version of Lektor by copy/pasting a command into your terminal. !!! Scared about copy/pasting this into a terminal? We will not do anything -before asking you for confirmation and you can download the script upfront -to see what it's doing. +before asking you for confirmation and you can download [the script](https://www.getlektor.com/installer.py) +upfront to see what it's doing. ### Mac/Linux -This will install Lektor for you but you might have to run it with `sudo` if -your current user does not have rights to write into `/usr/local`. +This will install Lektor in your `HOME`. Running it with `sudo` will result in +a system installation instead. ``` -curl -sf https://www.getlektor.com/install.sh | sh +curl -sf https://www.getlektor.com/installer.py | python3 ``` You might need additional dependencies for this installation. For more @@ -40,18 +40,19 @@ information see [Installation](../docs/installation/). ### Windows -If you are on Windows copy/paste this command into the `command prompt`: +If you are on Windows copy/paste this command into `Powershell`: ``` -@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1'))" && SET PATH=%PATH%;%LocalAppData%\lektor-cli +(new-object net.webclient).DownloadString('https://www.getlektor.com/installer.py') | python ``` -alternatively use this command in your `Powershell`: +or alternatively use this in `command prompt`: ``` -iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1')) +@powershell -NoProfile -Command "(new-object net.webclient).DownloadString('https://www.getlektor.com/installer.py') | python" ``` + ## Desktop Application Lektor supported an installable version of Lektor on OSX. The current build process for these installers is [old and in need of refactoring](https://github.com/lektor/lektor/issues/420). Temporarily until this is resolved, as of version 3.1, this installer is no longer supported.