1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
From: Stefano Rivera <stefanor@debian.org>
Date: Thu, 8 Oct 2015 10:29:38 -0700
Subject: Use Debian's figlet fonts.
Look in /usr/share/figlet rather than using importlib.resources to find
fonts.
Forwarded: not-needed
Last-Update: 2014-07-26
---
pyfiglet/__init__.py | 2 +-
pyfiglet/fonts/__init__.py | 1 +
pyfiglet/test.py | 6 +++---
setup.py | 9 ---------
test_font.sh | 2 +-
5 files changed, 6 insertions(+), 14 deletions(-)
create mode 100644 pyfiglet/fonts/__init__.py
diff --git a/pyfiglet/__init__.py b/pyfiglet/__init__.py
index 545d9d9..9c7e5ae 100755
--- a/pyfiglet/__init__.py
+++ b/pyfiglet/__init__.py
@@ -61,7 +61,7 @@ RESET_COLORS = b'\033[0m'
if sys.platform == 'win32':
SHARED_DIRECTORY = os.path.join(os.environ["APPDATA"], "pyfiglet")
else:
- SHARED_DIRECTORY = '/usr/local/share/pyfiglet/'
+ SHARED_DIRECTORY = '/usr/share/figlet/'
def figlet_format(text:str, font:str=DEFAULT_FONT, **kwargs:Any):
diff --git a/pyfiglet/fonts/__init__.py b/pyfiglet/fonts/__init__.py
new file mode 100644
index 0000000..d7da094
--- /dev/null
+++ b/pyfiglet/fonts/__init__.py
@@ -0,0 +1 @@
+# Not shipped by Debian, we use toilet's free fonts instead.
diff --git a/pyfiglet/test.py b/pyfiglet/test.py
index 7df002c..06ff629 100755
--- a/pyfiglet/test.py
+++ b/pyfiglet/test.py
@@ -40,9 +40,9 @@ class Test(object):
def outputUsingFigletorToilet(self, text, font, fontpath):
if os.path.isfile(fontpath + '.flf'):
- cmd = ('figlet', '-d', 'pyfiglet/fonts', '-f', font, text)
+ cmd = ('figlet', '-d', '/usr/share/figlet', '-f', font, text)
elif os.path.isfile(fontpath + '.tlf'):
- cmd = ('toilet', '-d', 'pyfiglet/fonts', '-f', font, text)
+ cmd = ('toilet', '-d', '/usr/share/figlet', '-f', font, text)
else:
raise Exception('Missing font file: {}'.format(fontpath))
@@ -80,7 +80,7 @@ class Test(object):
return
# Our TLF rendering isn't perfect, yet
- fontpath = os.path.join('pyfiglet', 'fonts', font)
+ fontpath = os.path.join('/usr/share/figlet', font)
fig_file = os.path.isfile(fontpath + '.flf')
if not use_tlf and not fig_file:
return
diff --git a/setup.py b/setup.py
index 661d9e9..dc9ec84 100755
--- a/setup.py
+++ b/setup.py
@@ -2,15 +2,7 @@
from setuptools import setup
import sys
-from os import path
-import shutil
-# Set up minimum fonts if none already present
-here = path.abspath(path.dirname(__file__))
-pkg_src = path.join(here, 'pyfiglet', 'fonts')
-repo_src = path.join(here, 'pyfiglet', 'fonts-standard')
-if not path.isdir(pkg_src):
- shutil.copytree(repo_src, pkg_src)
def get_version():
sys.path.insert(0, 'pyfiglet')
@@ -55,7 +47,6 @@ setup(
author_email='p@pwaller.net',
url='https://github.com/pwaller/pyfiglet',
packages=['pyfiglet', 'pyfiglet.fonts'],
- package_data={'pyfiglet.fonts': ['*.flf', '*.flc']},
entry_points={
'console_scripts': [
'pyfiglet = pyfiglet:main',
diff --git a/test_font.sh b/test_font.sh
index 3fe92ad..e8c0a77 100755
--- a/test_font.sh
+++ b/test_font.sh
@@ -1,5 +1,5 @@
#!/bin/bash
set -eux
pyfiglet -f $2 "$1" > /tmp/pyfiglet
-figlet -d pyfiglet/fonts -f $2 "$1"> /tmp/figlet
+figlet -f $2 "$1"> /tmp/figlet
vimdiff /tmp/figlet /tmp/pyfiglet
|
