summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmat-cli2
-rwxr-xr-xmat-gui2
-rwxr-xr-xsetup.py8
3 files changed, 7 insertions, 5 deletions
diff --git a/mat-cli b/mat-cli
index 6b2de43..8e38d97 100755
--- a/mat-cli
+++ b/mat-cli
@@ -116,7 +116,7 @@ def list_supported():
116 handler = mat.XMLParser() 116 handler = mat.XMLParser()
117 parser = xml.sax.make_parser() 117 parser = xml.sax.make_parser()
118 parser.setContentHandler(handler) 118 parser.setContentHandler(handler)
119 with open('FORMATS', 'r') as xmlfile: 119 with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile:
120 parser.parse(xmlfile) 120 parser.parse(xmlfile)
121 121
122 for item in handler.list: 122 for item in handler.list:
diff --git a/mat-gui b/mat-gui
index d92df74..a11bdff 100755
--- a/mat-gui
+++ b/mat-gui
@@ -355,7 +355,7 @@ data loss, but clean more efficiently'))
355 handler = mat.XMLParser() 355 handler = mat.XMLParser()
356 parser = xml.sax.make_parser() 356 parser = xml.sax.make_parser()
357 parser.setContentHandler(handler) 357 parser.setContentHandler(handler)
358 with open('FORMATS', 'r') as xmlfile: 358 with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile:
359 parser.parse(xmlfile) 359 parser.parse(xmlfile)
360 360
361 for item in handler.list: # list of dict : one dict per format 361 for item in handler.list: # list of dict : one dict per format
diff --git a/setup.py b/setup.py
index 2a1d230..2332505 100755
--- a/setup.py
+++ b/setup.py
@@ -9,10 +9,12 @@ setup(name='MAT',
9 author_email='julien.voisin@dustri.org', 9 author_email='julien.voisin@dustri.org',
10 license='GPLv2', 10 license='GPLv2',
11 url='https://gitweb.torproject.org/user/jvoisin/mat.git', 11 url='https://gitweb.torproject.org/user/jvoisin/mat.git',
12 packages=['mat', 'mat.hachoir_editor', 'mat.pdfrw', 'mat.bencode', 'mat.tarfile'], 12 packages=['mat', 'mat.hachoir_editor', 'mat.pdfrw', 'mat.bencode',
13 'mat.tarfile'],
13 scripts=['mat-cli', 'mat-gui'], 14 scripts=['mat-cli', 'mat-gui'],
14 data_files=[ 15 data_files=[
15 ( '/usr/share/applications/', [ 'mat.desktop' ] ), 16 ( 'share/applications', [ 'mat.desktop' ] ),
16 ( '', ['FORMATS'] ), 17 ( 'share/mat', ['FORMATS'] ),
18 ( 'share/doc/mat', ['README', 'TODO'] ),
17 ] 19 ]
18 ) 20 )