0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

update readme, installer

Browse source
This commit is contained in:
j 2014-09-09 16:34:42 +02:00
parent 6e2c91fb4c
commit 8bcc0d6841
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -6,7 +6,7 @@ Install
To install the latest release on Linux run: 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: on Mac OS X download this:
@ -39,7 +39,7 @@ To update to latest version:
./ctl update ./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 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 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: listed in requirements.txt and requirements-shared.txt:
pip install -r requirements.txt pip3 install -r requirements.txt
pip install -r requirements-shared.txt pip3 install -r requirements-shared.txt

8
install
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python2 #!/usr/bin/env python3
from __future__ import division, with_statement, print_function from __future__ import division, with_statement, print_function
from contextlib import closing from contextlib import closing
@ -63,8 +63,8 @@ class Install(Thread):
import simplejson import simplejson
import lxml import lxml
except: except:
apt_packages += ' python2.7 python-imaging python-simplejson python-lxml' apt_packages += ' python3.4 python3-pil python-simplejson python3-lxml'
yum_packages += ' python-imaging python-simplejson python-lxml' yum_packages += ' python3-imaging python3-simplejson python3-lxml'
if not has_bin('pdftocairo'): if not has_bin('pdftocairo'):
apt_packages += ' poppler-utils' apt_packages += ' poppler-utils'
yum_packages += ' poppler-utils' yum_packages += ' poppler-utils'
@ -76,7 +76,7 @@ class Install(Thread):
elif has_bin('yum') and yum_packages: elif has_bin('yum') and yum_packages:
os.system('sudo yum install ' + yum_packages) os.system('sudo yum install ' + yum_packages)
else: 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: if 'poppler' in apt_packages:
print('You need to install pdftocairo (part of poppler-utils)') print('You need to install pdftocairo (part of poppler-utils)')
if 'miredo' in apt_packages: if 'miredo' in apt_packages: