diff --git a/assets/install.sh b/assets/install.sh index 98332b6e..38d27c70 100644 --- a/assets/install.sh +++ b/assets/install.sh @@ -24,7 +24,7 @@ if 1: import json import tempfile import shutil - from subprocess import Popen + from subprocess import CalledProcessError, check_output, Popen try: from urllib.request import urlopen except ImportError: @@ -121,7 +121,10 @@ if 1: os.makedirs(lib_dir) except OSError: pass - Popen([sys.executable, './virtualenv.py', lib_dir], cwd=t).wait() + try: + check_output([sys.executable, './src/virtualenv.py', lib_dir], cwd=t) + except CalledProcessError: # virtualenv 16.1.0, 17+ + Popen([sys.executable, './virtualenv.py', lib_dir], cwd=t).wait() Popen([os.path.join(lib_dir, 'bin', 'pip'), 'install', '--upgrade', 'Lektor']).wait() os.symlink(os.path.join(lib_dir, 'bin', 'lektor'),