Compare commits

..

No commits in common. "c43ccd319dc6f38bcfb9b8dd46d3be58cd5b510e" and "9145ef5df6bcc90b9ed897988c4f09ae8c6578b8" have entirely different histories.

4 changed files with 12 additions and 22 deletions

View file

@ -36,9 +36,9 @@ To update to latest version:
./ctl update
On Linux you need a working python3.6 installation with pillow, python-lxml, pyOpenSSL and pyCrypto and popler-utils:
On Linux you need a working python3.4 installation with pillow, python-lxml, pyOpenSSL and pyCrypto and popler-utils:
apt-get install python3.6 python3-pil python3-lxml \
apt-get install python3.4 python3-pil python3-lxml \
python3-openssl python3-crypto poppler-utils \
libevent-2.0-5
@ -46,7 +46,7 @@ Platform
----------
If you install Open Media Library on a architecture/os that is currently
not supported, you need a working python 3.6 installation and the dependencies
not supported, you need a working python 3.4 installation and the dependencies
listed in requirements.txt and requirements-shared.txt:
pip3 install -r requirements.txt

4
ctl
View file

@ -147,11 +147,7 @@ if [ "$1" == "open" ]; then
if [ $SYSTEM == "Linux" ]; then
if [ -e "$PID" ]; then
if ps -p `cat "$PID"` > /dev/null; then
if [ -e /usr/bin/gio ]; then
gio open "file://${BASE}/openmedialibrary/static/html/load.html"
else
xdg-open "file://${BASE}/openmedialibrary/static/html/load.html"
fi
else
$PYTHON "${NAME}/oml/gtkstatus.py" $@
exit $?

View file

@ -264,9 +264,6 @@ def open_file(path=None):
if sys.platform == 'darwin':
cmd += ['open', path]
elif sys.platform.startswith('linux'):
if os.path.exists('/usr/bin/gio'):
cmd += ['gio', 'open', path]
else:
cmd += ['xdg-open', path]
elif sys.platform == 'win32':
path = '\\'.join(path.split('/'))
@ -288,9 +285,6 @@ def open_folder(folder=None, path=None):
path = folder
cmd += ['open', '-R', path]
elif sys.platform.startswith('linux'):
if os.path.exists('/usr/bin/gio'):
cmd += ['gio', 'open', folder]
else:
cmd += ['xdg-open', folder]
elif sys.platform == 'win32':
path = '\\'.join(path.split('/'))