From 3c583c278f78eb0c39210ce7d6483448d8d6af6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Wed, 3 Apr 2013 23:04:01 +0200 Subject: [PATCH] m setup fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- setup.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index d33bfd86..4eca0b90 100755 --- a/setup.py +++ b/setup.py @@ -16,12 +16,12 @@ PONYSAY_VERSION = '3.0alpha' manpages = [('en', 'English'), # must be first ('es', 'Spanish')] -sharedirs = [('ponies', 'xterm ponies', 'PONYDIR'), # must be first - ('ttyponies', 'tty ponies', 'TTYPONYDIR'), - ('extraponies', 'extra xterm ponies', 'XPONYDIR'), - ('extrattyponies', 'extra tty ponies', 'XTTYPONYDIR'), - ('quotes', 'pony quotes', 'QUOTEDIR'), - ('balloons', 'balloon styles', 'BALLOONDIR')] +sharedirs = [('ponies', 'xterm ponies', 'PONYDIR', True), # must be first + ('ttyponies', 'tty ponies', 'TTYPONYDIR', True), + ('extraponies', 'extra xterm ponies', 'XPONYDIR', True), + ('extrattyponies', 'extra tty ponies', 'XTTYPONYDIR', True), + ('quotes', 'pony quotes', 'QUOTEDIR', False), + ('balloons', 'balloon styles', 'BALLOONDIR', False)] sharefiles = [('ucs', 'ucsmap')] @@ -557,8 +557,8 @@ class Setup(): if ponymap is not None: ponymap.close() - for sharedir in [sharedir[0] for sharedir in sharedirs]: # TODO make this an opt-out option - if os.path.isdir(sharedir): + for (sharedir, hasponies) in [(sharedir[0], sharedir[3]) for sharedir in sharedirs]: # TODO make this an opt-out option + if hasponies and os.path.isdir(sharedir): for toolcommand in ('--dimensions', '--metadata'): if not self.free: print('%s, %s, %s' % ('./src/ponysay-tool.py', toolcommand, sharedir))