kms fix (however not working because of some bug in util-say)

This commit is contained in:
Mattias Andrée 2012-08-19 19:36:00 +02:00
parent 924a2ab8ed
commit 5dde586850
2 changed files with 13 additions and 4 deletions

4
configure vendored
View file

@ -223,6 +223,9 @@ function makeMakefile()
echo 'install "'"$file"'" "$(INSTALLDIR)/share/licenses/ponysay/'"$file"'"' echo 'install "'"$file"'" "$(INSTALLDIR)/share/licenses/ponysay/'"$file"'"'
done done
echo echo
echo -en '\t' ; echo 'mkdir -p $(DESTDIR)/var/cache/ponysay/'
echo -en '\t' ; echo 'chmod 777 $(DESTDIR)/var/cache/ponysay/'
echo
for completion in $completions; do for completion in $completions; do
shell="${completion##*/}" shell="${completion##*/}"
@ -286,6 +289,7 @@ EOF
echo echo
echo 'uninstall:' echo 'uninstall:'
echo -en '\t' ; echo 'if [ -d "$(DESTDIR)/var/cache/ponysay" ]; then rm -rf "$(INSTALLDIR)/var/cache/ponysay"; fi'
for old in $installedDirs; do for old in $installedDirs; do
echo -en '\t' echo -en '\t'
echo 'if [ -d "$(INSTALLDIR)/'"$old"'" ]; then rm -rf "$(INSTALLDIR)/'"$old"'"; fi' echo 'if [ -d "$(INSTALLDIR)/'"$old"'" ]; then rm -rf "$(INSTALLDIR)/'"$old"'"; fi'

View file

@ -491,23 +491,28 @@ class Ponysay():
palettefile = env_kms.replace('\033]P', '') palettefile = env_kms.replace('\033]P', '')
kmsponies = '/var/cache/ponysay/kmsponies/' + palettefile kmsponies = '/var/cache/ponysay/kmsponies/' + palettefile
kmspony = kmsponies + pony kmspony = (kmsponies + pony).replace('//', '/')
if not os.path.isfile(kmspony): if not os.path.isfile(kmspony):
protokmsponies = '/var/cache/ponysay/protokmsponies/' protokmsponies = '/var/cache/ponysay/protokmsponies/'
protokmspony = protokmsponies + pony protokmspony = (protokmsponies + pony).replace('//', '/')
protokmsponydir = protokmspony[:protokmspony.rindex('/')]
kmsponydir = kmspony[: kmspony.rindex('/')]
_protokmspony = '\'' + protokmspony.replace('\'', '\'\\\'\'') + '\'' _protokmspony = '\'' + protokmspony.replace('\'', '\'\\\'\'') + '\''
_kmspony = '\'' + kmspony.replace('\'', '\'\\\'\'') + '\'' _kmspony = '\'' + kmspony.replace('\'', '\'\\\'\'') + '\''
_pony = '\'' + pony.replace('\'', '\'\\\'\'') + '\'' _pony = '\'' + pony.replace('\'', '\'\\\'\'') + '\''
if not os.path.isfile(protokmspony): if not os.path.isfile(protokmspony):
os.makedirs(protokmsponies) if not os.path.isdir(protokmsponydir):
os.makedirs(protokmsponydir)
if not os.system('ponysay2ttyponysay < ' + _pony + ' > ' + _protokmspony) == 0: if not os.system('ponysay2ttyponysay < ' + _pony + ' > ' + _protokmspony) == 0:
sys.stderr.write('Unable to run ponysay2ttyponysay successfully, you need util-say for KMS support\n') sys.stderr.write('Unable to run ponysay2ttyponysay successfully, you need util-say for KMS support\n')
exit(1) exit(1)
os.makedirs(kmsponies) if not os.path.isdir(kmsponydir):
os.makedirs(kmsponydir)
if not os.system('tty2colourfultty -e -p ' + palette + ' < ' + _protokmspony + ' > ' + _kmspony) == 0: if not os.system('tty2colourfultty -e -p ' + palette + ' < ' + _protokmspony + ' > ' + _kmspony) == 0:
sys.stderr.write('Unable to run tty2colourfultty successfully, you need util-say for KMS support\n') sys.stderr.write('Unable to run tty2colourfultty successfully, you need util-say for KMS support\n')
exit(1) exit(1)