diff options
| author | Aur??lio A. Heckert <aurium@gmail.com> | 2008-12-01 22:35:10 +0000 |
|---|---|---|
| committer | aurium <aurium@users.sourceforge.net> | 2008-12-01 22:35:10 +0000 |
| commit | c76a118fe30f6f9129b264aab634cc068d9ad6ad (patch) | |
| tree | 63154077e33d68a7fbe1372e2e6d00eaf6c66b08 /share | |
| parent | filename change matched again (diff) | |
| download | inkscape-c76a118fe30f6f9129b264aab634cc068d9ad6ad.tar.gz inkscape-c76a118fe30f6f9129b264aab634cc068d9ad6ad.zip | |
providing compatibility for uniconversor name variations
(bzr r6928)
Diffstat (limited to 'share')
| -rw-r--r-- | share/extensions/cdr_input.inx | 2 | ||||
| -rw-r--r-- | share/extensions/uniconv-ext.py | 26 |
2 files changed, 24 insertions, 4 deletions
diff --git a/share/extensions/cdr_input.inx b/share/extensions/cdr_input.inx index 7a25ffcf4..781789719 100644 --- a/share/extensions/cdr_input.inx +++ b/share/extensions/cdr_input.inx @@ -2,7 +2,7 @@ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension"> <_name>Corel DRAW Input</_name> <id>org.inkscape.input.cdr</id> - <dependency type="executable" location="path">uniconv</dependency> + <!-- the uniconv or uniconvertor dependency will be tested by uniconv-ext.py --> <dependency type="executable" location="extensions">uniconv-ext.py</dependency> <input> <extension>.cdr</extension> diff --git a/share/extensions/uniconv-ext.py b/share/extensions/uniconv-ext.py index 4dba05eea..961498330 100644 --- a/share/extensions/uniconv-ext.py +++ b/share/extensions/uniconv-ext.py @@ -23,8 +23,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import sys from run_command import run - -run('uniconv "%s" "%%s"' % sys.argv[1].replace("%","%%"), "UniConvertor") - +from subprocess import Popen, PIPE + +#sys.stderr.write('aaaaaaa') + +try: + p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() + if p!=127 : cmd = 'uniconv' + p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() + if p!=127 : cmd = 'uniconvertor' +except ImportError: + try: + from popen2 import Popen3 + p = Popen3('uniconv', True).wait() + if p!=32512 : cmd = 'uniconv' + p = Popen3('uniconvertor', True).wait() + if p!=32512 : cmd = 'uniconvertor' + except ImportError: + sys.stderr.write('You need to install the UniConvertor software.\n'+\ + 'For Linux: install the packge python-uniconvertor.\n'+\ + 'For Windows: download it from\n'+\ + 'http://sk1project.org/modules.php?name=Products&product=uniconvertor\n') + +run((cmd+' "%s" "%%s"') % sys.argv[1].replace("%","%%"), "UniConvertor") # vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 |