PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2025-02-16 17:44:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix ponysay-tool installation

Browse source 
Signed-off-by: Mattias Andrée <maandree@operamail.com>
This commit is contained in:
Mattias Andrée 2013-04-04 14:14:09 +02:00
parent 7bbc0a0266
commit 298679fecf
3 changed files with 65 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
setup.py
View file

@ -558,17 +558,17 @@ class Setup():
if hasponies and os.path.isdir(sharedir): if hasponies and os.path.isdir(sharedir):
for toolcommand in ('--dimensions', '--metadata'): for toolcommand in ('--dimensions', '--metadata'):
if not self.free: if not self.free:
print('%s, %s, %s' % ('./src/ponysay-tool.py', toolcommand, sharedir)) print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir))
Popen(['./src/ponysay-tool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
else: else:
params = ['./src/ponysay-tool.py', toolcommand, sharedir, '--'] params = ['./src/ponysaytool.py', toolcommand, sharedir, '--']
for sharefile in os.listdir(sharedir): for sharefile in os.listdir(sharedir):
if sharefile.endswith('.pony') and (sharefile != '.pony'): if sharefile.endswith('.pony') and (sharefile != '.pony'):
if not Setup.validateFreedom(sharedir + '/' + sharefile): if not Setup.validateFreedom(sharedir + '/' + sharefile):
print('Skipping metadata correction for %s/%s, did not pass validation process made by setup settings' % (sharedir, sharefile)) print('Skipping metadata correction for %s/%s, did not pass validation process made by setup settings' % (sharedir, sharefile))
else: else:
params.append(sharefile) params.append(sharefile)
print('%s, %s, %s (with files)' % ('./src/ponysay-tool.py', toolcommand, sharedir)) print('%s, %s, %s (with files)' % ('./src/ponysaytool.py', toolcommand, sharedir))
Popen(params, stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() Popen(params, stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
print() print()

3
src/__main__.py
View file

@ -56,8 +56,7 @@ if __name__ == '__main__':
istool = istool[:istool.find(os.extsep)] istool = istool[:istool.find(os.extsep)]
istool = istool.endswith('-tool') istool = istool.endswith('-tool')
if istool: if istool:
from ponysaytool import * from ponysaytool import * ## will start ponysay-tool
startponysaytool()
exit(0) exit(0)
isthink = sys.argv[0] isthink = sys.argv[0]

8
src/ponysaytool.py
View file

@ -1183,10 +1183,6 @@ class TextArea(): # TODO support small screens
'''
Start the program
'''
def startponysaytool():
''' '''
The user's home directory The user's home directory
''' '''
@ -1252,7 +1248,3 @@ def startponysaytool():
PonysayTool(args = opts) PonysayTool(args = opts)
if __name__ == '__main__':
startponysaytool()