diff --git a/assets/install.ps1 b/assets/install.ps1 index 26c25e89..15715997 100644 --- a/assets/install.ps1 +++ b/assets/install.ps1 @@ -68,7 +68,7 @@ def install(virtualenv_url, virtualenv_filename, install_dir, lib_dir): scripts = os.path.join(lib_dir, 'Scripts') #just using pip.exe and cwd will still install globally Popen([os.path.join(scripts, 'pip.exe'), - 'install', '--upgrade', 'git+https://github.com/lektor/lektor'], + 'install', '--upgrade', 'Lektor'], cwd=scripts).wait() with open(os.path.join(install_dir, 'lektor.cmd'), 'w') as link_file: diff --git a/content/docs/installation/contents.lr b/content/docs/installation/contents.lr index 41317094..2173db7f 100644 --- a/content/docs/installation/contents.lr +++ b/content/docs/installation/contents.lr @@ -32,14 +32,22 @@ You need to make sure you have the following software installed on your computer * Python 2.7 (**not** Python 3.x) * ImageMagick (`brew install imagemagick` or `apt-get install imagemagick` - can get you this on OS X and Ubuntu respectively) + can get you this on OS X and Ubuntu respectively, on Windows do `choco install imagemagick`, which requires [chocolatey](https://chocolatey.org/), or download from [here](http://www.imagemagick.org)) -Once you have that installed you can get Lektor installed with our +Once you have that installed and made sure that they are on your `PATH` you can get Lektor installed with our installation script: ``` $ curl -sf https://www.getlektor.com/install.sh | sh ``` +For Windows you can use the `command prompt`: +``` +C:\> @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1'))" && SET PATH=%PATH%;%LocalAppData%\lektor-cli +``` +but you can also do it directly in `Powershell`: +``` +PS C:\> iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1')) +``` Alternatively you can manually install it with `virtualenv` if you know how that works: diff --git a/content/downloads/contents.lr b/content/downloads/contents.lr index 6f5e434f..89166f4f 100644 --- a/content/downloads/contents.lr +++ b/content/downloads/contents.lr @@ -6,13 +6,17 @@ body: #### banner #### image: header.jpg -#### text-block #### -class: default ---- +height: 300 +---- +class: +---- +contents: +#### text-block #### text: Lektor is an [Open Source Project](../license/) and freely available to -download. As it's currently still under heavy development not all platforms +download. As it's currently still under heavy development and not all platforms are equally well supported. ## Command Line Interface @@ -23,6 +27,14 @@ Lektor by copy/pasting a command into your terminal: ``` curl -sf https://www.getlektor.com/install.sh | sh ``` +If you are on Windows copy/paste this command into the `command prompt`: +``` +@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1'))" && SET PATH=%PATH%;%LocalAppData%\lektor-cli +``` +alternatively use this command in your `Powershell`: +``` +iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1')) +``` The command line application is written in Python and the current releases can be found on PyPI: [pypi/Lektor](http://pypi.python.org/pypi/Lektor). @@ -44,3 +56,5 @@ includes the command line utilities. Download Desktop App +---- +class: default