Skip to content

Commit c8b8ab0

Browse files
Alex-developerAlex-developer
committed
#4131 Initial commit to test
1 parent 9b96e27 commit c8b8ab0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+62
-23
lines changed

‎config_repo/overlay/system_fonts/Andale_Mono.ttf

103 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Arial.ttf

269 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Arial_Black.ttf

114 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Arial_Bold.ttf

280 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Arial_Bold_Italic.ttf

219 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Arial_Italic.ttf

201 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Comic_Sans_MS.ttf

123 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Comic_Sans_MS_Bold.ttf

109 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Courier_New.ttf

296 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Courier_New_Bold.ttf

304 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Courier_New_Bold_Italic.ttf

229 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Courier_New_Italic.ttf

238 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Georgia.ttf

140 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Georgia_Bold.ttf

136 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Georgia_Bold_Italic.ttf

155 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Georgia_Italic.ttf

153 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Impact.ttf

133 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Times_New_Roman.ttf

323 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Times_New_Roman_Bold.ttf

326 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Times_New_Roman_Bold_Italic.ttf

233 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Times_New_Roman_Italic.ttf

241 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Trebuchet_MS.ttf

124 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Trebuchet_MS_Bold.ttf

121 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Trebuchet_MS_Bold_Italic.ttf

128 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Trebuchet_MS_Italic.ttf

136 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Verdana.ttf

136 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Verdana_Bold.ttf

133 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Verdana_Bold_Italic.ttf

150 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Verdana_Italic.ttf

151 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/Webdings.ttf

116 KB
Binary file not shown.

‎config_repo/overlay/system_fonts/andalemo.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Andale_Mono.ttf

‎config_repo/overlay/system_fonts/arial.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arial.ttf

‎config_repo/overlay/system_fonts/arialbd.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arial_Bold.ttf

‎config_repo/overlay/system_fonts/arialbi.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arial_Bold_Italic.ttf

‎config_repo/overlay/system_fonts/ariali.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arial_Italic.ttf

‎config_repo/overlay/system_fonts/ariblk.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arial_Black.ttf

‎config_repo/overlay/system_fonts/comic.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Comic_Sans_MS.ttf

‎config_repo/overlay/system_fonts/comicbd.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Comic_Sans_MS_Bold.ttf

‎config_repo/overlay/system_fonts/cour.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Courier_New.ttf

‎config_repo/overlay/system_fonts/courbd.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Courier_New_Bold.ttf

‎config_repo/overlay/system_fonts/courbi.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Courier_New_Bold_Italic.ttf

‎config_repo/overlay/system_fonts/couri.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Courier_New_Italic.ttf

‎config_repo/overlay/system_fonts/georgia.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Georgia.ttf

‎config_repo/overlay/system_fonts/georgiab.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Georgia_Bold.ttf

‎config_repo/overlay/system_fonts/georgiai.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Georgia_Italic.ttf

‎config_repo/overlay/system_fonts/georgiaz.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Georgia_Bold_Italic.ttf

‎config_repo/overlay/system_fonts/impact.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Impact.ttf

‎config_repo/overlay/system_fonts/times.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Times_New_Roman.ttf

‎config_repo/overlay/system_fonts/timesbd.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Times_New_Roman_Bold.ttf

‎config_repo/overlay/system_fonts/timesbi.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Times_New_Roman_Bold_Italic.ttf

‎config_repo/overlay/system_fonts/timesi.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Times_New_Roman_Italic.ttf

‎config_repo/overlay/system_fonts/trebuc.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Trebuchet_MS.ttf

‎config_repo/overlay/system_fonts/trebucbd.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Trebuchet_MS_Bold.ttf

‎config_repo/overlay/system_fonts/trebucbi.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Trebuchet_MS_Bold_Italic.ttf

‎config_repo/overlay/system_fonts/trebucit.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Trebuchet_MS_Italic.ttf

‎config_repo/overlay/system_fonts/ttf-mscorefonts-installer.22TsPS/msfonts.info

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
48d9bc613917709d3b0e0f4a6d4fe33a5c544c5035dffe9e90bc11e50e822071 Andale_Mono.ttf andale32.exe andalemo.ttf
2+
dad7c04acb26e23dfe4780e79375ca193ddaf68409317e81577a30674668830e Arial_Black.ttf arialb32.exe ariblk.ttf
3+
35c0f3559d8db569e36c31095b8a60d441643d95f59139de40e23fada819b833 Arial.ttf arial32.exe arial.ttf
4+
4044aa6b5bebbc36980206b45b0aaaaa5681552a48bcadb41746d5d1d71fd7b4 Arial_Bold.ttf arial32.exe arialbd.ttf
5+
2f371cd9d96b3ac544519d85c16dc43ceacdfcea35090ee8ddf3ec5857c50328 Arial_Bold_Italic.ttf arial32.exe arialbi.ttf
6+
70ade233175a6a6675e4501461af9326e6f78b1ffdf787ca0da5ab0fc8c9cfd6 Arial_Italic.ttf arial32.exe ariali.ttf
7+
b82c53776058f291382ff7e008d4675839d2dc21eb295c66391f6fb0655d8fc0 Comic_Sans_MS.ttf comic32.exe comic.ttf
8+
873361465d994994762d0b9845c99fc7baa2a600442ea8db713a7dd19f8b0172 Comic_Sans_MS_Bold.ttf comic32.exe comicbd.ttf
9+
6715838c52f813f3821549d3f645db9a768bd6f3a43d8f85a89cb6875a546c61 Courier_New.ttf courie32.exe cour.ttf
10+
edf8a7c5bfcac2e1fe507faab417137cbddc9071637ef4648238d0768c921e02 Courier_New_Bold.ttf courie32.exe courbd.ttf
11+
f3f6b09855b6700977e214aab5eb9e5be6813976a24f894bd7766e92c732fbe1 Courier_New_Italic.ttf courie32.exe couri.ttf
12+
66dbfa20b534fba0e203da140fec7276a45a1069e424b1b9c35547538128bbe8 Courier_New_Bold_Italic.ttf courie32.exe courbi.ttf
13+
7d0bb20c632bb59e81a0885f573bd2173f71f73204de9058feb68ce032227072 Georgia.ttf georgi32.exe georgia.ttf
14+
82d2fbadb88a8632d7f2e8ad50420c9fd2e7d3cbc0e90b04890213a711b34b93 Georgia_Bold.ttf georgi32.exe georgiab.ttf
15+
1523f19bda6acca42c47c50da719a12dd34f85cc2606e6a5af15a7728b377b60 Georgia_Italic.ttf georgi32.exe georgiai.ttf
16+
c983e037d8e4e694dd0fb0ba2e625bca317d67a41da2dc81e46a374e53d0ec8a Georgia_Bold_Italic.ttf georgi32.exe georgiaz.ttf
17+
00f1fc230ac99f9b97ba1a7c214eb5b909a78660cb3826fca7d64c3af5a14848 Impact.ttf impact32.exe impact.ttf
18+
4e98adeff8ccc8ef4e3ece8d4547e288ff85fdc9c7ca711a4599c234874bbe86 Times_New_Roman.ttf times32.exe times.ttf
19+
4357b63cef20c01661a53c5dae70ffd20cb4765503aaed6d38b17a57c5a90bff Times_New_Roman_Bold.ttf times32.exe timesbd.ttf
20+
192e1b0d18e90334e999a99f8c32808d6a2e74b3698b8cd90c943c2249a46549 Times_New_Roman_Bold_Italic.ttf times32.exe timesbi.ttf
21+
c25ae529b4cecdbca148b6ccb862ee0abad770af8b1fd29c8dba619d1b8da78a Times_New_Roman_Italic.ttf times32.exe timesi.ttf
22+
ec3ffb302488251e1b67fb09dd578b364c5339e27c1cfb26eb627666236453d0 Trebuchet_MS.ttf trebuc32.exe trebuc.ttf
23+
f65941f9487c0a0a3b7445996ecbbd24466d7ae76ea2a597ced55f438fa63838 Trebuchet_MS_Bold.ttf trebuc32.exe trebucbd.ttf
24+
db56fdac7d3ba20b7aededcb6ee86c46687489d17b759e1708ea4e2d21e38410 Trebuchet_MS_Italic.ttf trebuc32.exe trebucit.ttf
25+
c0a6bdf31f9f2953b2f08a0c1734c892bc825f0fb17c604d420f7acf203a213b Trebuchet_MS_Bold_Italic.ttf trebuc32.exe trebucbi.ttf
26+
96ed14949ca4b7392cff235b9c41d55c125382abbe0c0d3c2b9dd66897cae0cb Verdana.ttf verdan32.exe verdana.ttf
27+
c8f5065ba91680f596af3b0378e2c3e713b95a523be3d56ae185ca2b8f5f0b23 Verdana_Bold.ttf verdan32.exe verdanab.ttf
28+
91b59186656f52972531a11433c866fd56e62ec4e61e2621a2dba70c8f19a828 Verdana_Italic.ttf verdan32.exe verdanai.ttf
29+
698e220f48f4a40e77af7eb34958c8fd02f1e18c3ba3f365d93bfa2ed4474c80 Verdana_Bold_Italic.ttf verdan32.exe verdanaz.ttf
30+
10d099c88521b1b9e380b7690cbe47b54bb19396ca515358cfdc15ac249e2f5d Webdings.ttf webdin32.exe webdings.ttf

‎config_repo/overlay/system_fonts/verdana.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Verdana.ttf

‎config_repo/overlay/system_fonts/verdanab.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Verdana_Bold.ttf

‎config_repo/overlay/system_fonts/verdanai.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Verdana_Italic.ttf

‎config_repo/overlay/system_fonts/verdanaz.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Verdana_Bold_Italic.ttf

‎config_repo/overlay/system_fonts/webdings.ttf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Webdings.ttf

‎install.sh

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,26 +2953,6 @@ do_update()
29532953
exit_installation 0 "${STATUS_OK}" "Update completed."
29542954
}
29552955

2956-
####
2957-
# Install the Truetype fonts
2958-
install_fonts()
2959-
{
2960-
declare -n v="${FUNCNAME[0]}"
2961-
if [[ ${v} == "true" ]]; then
2962-
display_msg --logonly info "Fonts already installed"
2963-
return
2964-
fi
2965-
[[ ${SKIP} == "true" ]] && return
2966-
2967-
display_msg --log progress "Installing Truetype fonts."
2968-
TMP="${ALLSKY_LOGS}/msttcorefonts.log"
2969-
local M="Truetype fonts failed"
2970-
run_aptGet msttcorefonts > "${TMP}" 2>&1
2971-
check_success $? "${M}" "${TMP}" "${DEBUG}" || exit_with_image 1 "${STATUS_ERROR}" "${M}"
2972-
2973-
STATUS_VARIABLES+=( "${FUNCNAME[0]}='true'\n" )
2974-
}
2975-
29762956
####
29772957
# Install the overlay and modules system
29782958
install_PHP_modules()
@@ -3836,7 +3816,6 @@ set_locale
38363816
create_allsky_logs "true" # "true" == do everything
38373817

38383818
##### Install the overlay and modules system and things it needs
3839-
install_fonts
38403819
install_PHP_modules
38413820
install_Python
38423821
install_overlay

‎scripts/modules/allsky_overlay.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ def _timer(self, text, showIntermediate=True, showMessage=True):
442442
s.log(4, f"INFO: {text} Elapsed time {elapsedTime.total_seconds():.6f} seconds")
443443

444444
def _getFont(self, font, fontSize):
445-
446-
tt = '/usr/share/fonts/truetype/msttcorefonts'
445+
446+
tt = os.path.join(s.ALLSKY_OVERLAY, 'system_fonts')
447447
systemFontMapCased = {
448448
'Arial': {'fontpath': f'{tt}/Arial.ttf'},
449449
'Arial Black': {'fontpath': f'{tt}/Arial_Black.ttf'},

0 commit comments

Comments
 (0)