From 8bcc0d684112d4f04db4336064c0a04a7f43a17d Mon Sep 17 00:00:00 2001 From: j Date: Tue, 9 Sep 2014 16:34:42 +0200 Subject: [PATCH] update readme, installer --- README.md | 10 +++++----- install | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8e6dbeb..bb2d902 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Install To install the latest release on Linux run: - curl https://git.0x2620.org/openmedialibrary.git/HEAD:/install | python2 + curl https://git.0x2620.org/openmedialibrary.git/HEAD:/install | python3 on Mac OS X download this: @@ -39,7 +39,7 @@ To update to latest version: ./ctl update -On Linux you need a working python2 installation with pillow, pyhon-lxml and poppler-utils: +On Linux you need a working python3 installation with pillow, pyhon-lxml and poppler-utils: apt-get install python3.4 python3-pil python3-lxml poppler-utils @@ -48,9 +48,9 @@ Platform ---------- If you install Open Media Library on a architecture/os that is currently -not upported, you need a working python 2.7 installation and the dependencies +not upported, you need a working python 3.4 installation and the dependencies listed in requirements.txt and requirements-shared.txt: - pip install -r requirements.txt - pip install -r requirements-shared.txt + pip3 install -r requirements.txt + pip3 install -r requirements-shared.txt diff --git a/install b/install index b04023e..6b012d6 100755 --- a/install +++ b/install @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 from __future__ import division, with_statement, print_function from contextlib import closing @@ -63,8 +63,8 @@ class Install(Thread): import simplejson import lxml except: - apt_packages += ' python2.7 python-imaging python-simplejson python-lxml' - yum_packages += ' python-imaging python-simplejson python-lxml' + apt_packages += ' python3.4 python3-pil python-simplejson python3-lxml' + yum_packages += ' python3-imaging python3-simplejson python3-lxml' if not has_bin('pdftocairo'): apt_packages += ' poppler-utils' yum_packages += ' poppler-utils' @@ -76,7 +76,7 @@ class Install(Thread): elif has_bin('yum') and yum_packages: os.system('sudo yum install ' + yum_packages) else: - print('You need to install PIL and simplejson\ni.e. sudo pip install --allow-external PIL --allow-unverified PIL PIL simplejson lxml') + print('You need to install Pillow, simplejson and lxml\ni.e. sudo pip3 install pillow simplejson lxml') if 'poppler' in apt_packages: print('You need to install pdftocairo (part of poppler-utils)') if 'miredo' in apt_packages: