Commit Graph

15 Commits

Author SHA1 Message Date
Joseph Nix 9449a161ec [master] Flipping incorrect comment explaining try/except 2018-12-04 12:58:59 -06:00
Joseph Nix 408416a842 [lektor-619] Fixing https://github.com/lektor/lektor/issues/619, cuased by https://github.com/pypa/virtualenv/issues/1241 2018-12-04 12:48:16 -06:00
Joseph Nix 894b2471c3 [master] Fixing formatting error in print messages. 2018-01-30 12:15:17 -06:00
Joseph Nix 885ddf2b08
formatting tweak 2018-01-17 17:18:31 -06:00
Joseph Nix fc4403d051
Merge branch 'master' into master 2018-01-17 17:17:33 -06:00
Евгений a434eb5333
Update install.sh
Fix to avoid "TypeError: the JSON object must be str, not 'bytes'" error while installing.

Traceback:
curl -sf https://www.getlektor.com/install.sh | sudo sh

Welcome to Lektor

This script will install Lektor on your computer.

Installing at:
  bin: /usr/local/bin
  app: /usr/local/lib/lektor

Continue? [Yn] y
Traceback (most recent call last):
  File "<stdin>", line 142, in <module>
  File "<stdin>", line 130, in main
  File "/usr/lib/python3.5/json/__init__.py", line 268, in load
    parse_constant=parse_constant, object_pairs_hook=object_pairs_hook, **kw)
  File "/usr/lib/python3.5/json/__init__.py", line 312, in loads
    s.__class__.__name__))
TypeError: the JSON object must be str, not 'bytes'
2017-11-19 12:19:49 +03:00
David Baumgold ca22f06a5b Fix Python 3 import problems in install scripts 2017-06-16 10:50:54 -04:00
Stuart Laughlin 502f36bcdb Allows Lektor to be installed without prompt by setting env var. 2016-10-11 12:07:16 -05:00
David Baumgold a98b2fe9f9 Document Python 3 support
Now that Lektor supports Python 3, we need to document this support.
This change is perhaps a bit extreme: it replaces all explicit
references to Python 2.7 with explicit references to Python 3.5.
However, it's a good start, and it can and should be reviewed before
being merged.
2016-06-02 21:55:55 -07:00
Elias Zeitfogel 0caf39384e Added improvements from https://github.com/lektor/lektor-website/pull/70 2016-02-10 17:55:41 +01:00
Armin Ronacher 7b29ad6eb9 Update install.sh
Fixed a python detection bug.
2015-12-27 12:03:28 +01:00
Armin Ronacher eaeaec76ad Try python2 and python for the install script 2015-12-27 00:36:08 +01:00
Elias Zeitfogel 3f9daf0e0f Wiping previous installation upon confirmation 2015-12-25 12:26:52 +01:00
Elias Zeitfogel 258c889679 Wiping previous lektor installations 2015-12-23 18:54:17 +01:00
Armin Ronacher b5baa037bf Initial commit 2015-12-19 14:52:17 +01:00