PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2025-01-31 18:36:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

bug fixes

Browse source 
Signed-off-by: Mattias Andrée <maandree@operamail.com>
This commit is contained in:
Mattias Andrée 2013-04-01 21:43:21 +02:00
parent a5b7489e14
commit 9fb1cb4adf
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ponysay.py
View file

@ -313,8 +313,8 @@ class Ponysay():
else: args.opts[sl] = args.opts[ssl] else: args.opts[sl] = args.opts[ssl]
## Save whether standard or extra ponies are used ## Save whether standard or extra ponies are used
self.usingstandard = (args.opts['-f'] is not None) or (args.opts['-F'] is not None) or (args.opts['-q'] is not None) or (args.opts['-Q'] is not None) self.usingstandard = (args.opts['-f'] is not None) or (args.opts['-F'] is not None) or (args.opts['-q'] is not None) #or (args.opts['-Q'] is not None)
self.usingextra = (args.opts['+f'] is not None) or (args.opts['-F'] is not None) or (args.opts['+q'] is not None) or (args.opts['-Q'] is not None) self.usingextra = (args.opts['+f'] is not None) or (args.opts['-F'] is not None) #or (args.opts['+q'] is not None) or (args.opts['-Q'] is not None)
## Run modes ## Run modes
if args.opts['-h'] is not None: args.help() if args.opts['-h'] is not None: args.help()
@ -1216,7 +1216,7 @@ class Ponysay():
## Use PNG file as pony file ## Use PNG file as pony file
if endswith(pony.lower(), '.png'): if endswith(pony.lower(), '.png'):
pony = '\'' + pony.replace('\'', '\'\\\'\'') + '\'' pony = '\'' + pony.replace('\'', '\'\\\'\'') + '\''
pngcmd = 'ponytool --in image --file %s --out ponysay --platform %s --balloon y' pngcmd = 'ponytool --import image --file %s --export ponysay --platform %s --balloon y'
pngcmd %= (pony, ('linux' if self.linuxvt else 'xterm')) # XXX xterm should be haiku in Haiku pngcmd %= (pony, ('linux' if self.linuxvt else 'xterm')) # XXX xterm should be haiku in Haiku
pngpipe = os.pipe() pngpipe = os.pipe()
Popen(pngcmd, stdout=os.fdopen(pngpipe[1], 'w'), shell=True).wait() Popen(pngcmd, stdout=os.fdopen(pngpipe[1], 'w'), shell=True).wait()
@ -1447,8 +1447,8 @@ class Ponysay():
os.makedirs(kmsponydir) os.makedirs(kmsponydir)
if shared: if shared:
Popen('chmod -R 6777 -- ' + _cachedir, shell=True).wait() Popen('chmod -R 6777 -- ' + _cachedir, shell=True).wait()
ponytoolcmd = 'ponytoolcmd --import ponysay --file %s --export ponysay --file %s --platform linux ' + _ ponytoolcmd = 'ponytool --import ponysay --file %s --export ponysay --file %s --platform linux '
'--balloon n --colourful y --fullcolour y --left - --right - --top - --bottom - --palette %s' ponytoolcmd += '--balloon n --colourful y --fullcolour y --left - --right - --top - --bottom - --palette %s'
if not os.system(ponytoolcmd % (_pony, _kmspony, palette)) == 0: if not os.system(ponytoolcmd % (_pony, _kmspony, palette)) == 0:
sys.stderr.write('Unable to run ponytool successfully, you need util-say>=3 for KMS support\n') sys.stderr.write('Unable to run ponytool successfully, you need util-say>=3 for KMS support\n')
exit(1) exit(1)