diff --git a/config_repo/overlay/system_fonts/Andale_Mono.ttf b/config_repo/overlay/system_fonts/Andale_Mono.ttf new file mode 100644 index 000000000..40f4e4d41 Binary files /dev/null and b/config_repo/overlay/system_fonts/Andale_Mono.ttf differ diff --git a/config_repo/overlay/system_fonts/Arial.ttf b/config_repo/overlay/system_fonts/Arial.ttf new file mode 100644 index 000000000..7ff88f228 Binary files /dev/null and b/config_repo/overlay/system_fonts/Arial.ttf differ diff --git a/config_repo/overlay/system_fonts/Arial_Black.ttf b/config_repo/overlay/system_fonts/Arial_Black.ttf new file mode 100644 index 000000000..b51c8c267 Binary files /dev/null and b/config_repo/overlay/system_fonts/Arial_Black.ttf differ diff --git a/config_repo/overlay/system_fonts/Arial_Bold.ttf b/config_repo/overlay/system_fonts/Arial_Bold.ttf new file mode 100644 index 000000000..c2eb3ddd5 Binary files /dev/null and b/config_repo/overlay/system_fonts/Arial_Bold.ttf differ diff --git a/config_repo/overlay/system_fonts/Arial_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Arial_Bold_Italic.ttf new file mode 100644 index 000000000..c816eddbe Binary files /dev/null and b/config_repo/overlay/system_fonts/Arial_Bold_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Arial_Italic.ttf b/config_repo/overlay/system_fonts/Arial_Italic.ttf new file mode 100644 index 000000000..563b7d269 Binary files /dev/null and b/config_repo/overlay/system_fonts/Arial_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Comic_Sans_MS.ttf b/config_repo/overlay/system_fonts/Comic_Sans_MS.ttf new file mode 100644 index 000000000..d17e1be6c Binary files /dev/null and b/config_repo/overlay/system_fonts/Comic_Sans_MS.ttf differ diff --git a/config_repo/overlay/system_fonts/Comic_Sans_MS_Bold.ttf b/config_repo/overlay/system_fonts/Comic_Sans_MS_Bold.ttf new file mode 100644 index 000000000..75be50486 Binary files /dev/null and b/config_repo/overlay/system_fonts/Comic_Sans_MS_Bold.ttf differ diff --git a/config_repo/overlay/system_fonts/Courier_New.ttf b/config_repo/overlay/system_fonts/Courier_New.ttf new file mode 100644 index 000000000..9b06e57e8 Binary files /dev/null and b/config_repo/overlay/system_fonts/Courier_New.ttf differ diff --git a/config_repo/overlay/system_fonts/Courier_New_Bold.ttf b/config_repo/overlay/system_fonts/Courier_New_Bold.ttf new file mode 100644 index 000000000..9b8d4f08e Binary files /dev/null and b/config_repo/overlay/system_fonts/Courier_New_Bold.ttf differ diff --git a/config_repo/overlay/system_fonts/Courier_New_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Courier_New_Bold_Italic.ttf new file mode 100644 index 000000000..106b2bf22 Binary files /dev/null and b/config_repo/overlay/system_fonts/Courier_New_Bold_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Courier_New_Italic.ttf b/config_repo/overlay/system_fonts/Courier_New_Italic.ttf new file mode 100644 index 000000000..31b90aee6 Binary files /dev/null and b/config_repo/overlay/system_fonts/Courier_New_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Georgia.ttf b/config_repo/overlay/system_fonts/Georgia.ttf new file mode 100644 index 000000000..c24d59b68 Binary files /dev/null and b/config_repo/overlay/system_fonts/Georgia.ttf differ diff --git a/config_repo/overlay/system_fonts/Georgia_Bold.ttf b/config_repo/overlay/system_fonts/Georgia_Bold.ttf new file mode 100644 index 000000000..2cfce236e Binary files /dev/null and b/config_repo/overlay/system_fonts/Georgia_Bold.ttf differ diff --git a/config_repo/overlay/system_fonts/Georgia_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Georgia_Bold_Italic.ttf new file mode 100644 index 000000000..f60957ef0 Binary files /dev/null and b/config_repo/overlay/system_fonts/Georgia_Bold_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Georgia_Italic.ttf b/config_repo/overlay/system_fonts/Georgia_Italic.ttf new file mode 100644 index 000000000..27abc9de9 Binary files /dev/null and b/config_repo/overlay/system_fonts/Georgia_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Impact.ttf b/config_repo/overlay/system_fonts/Impact.ttf new file mode 100644 index 000000000..114e6c196 Binary files /dev/null and b/config_repo/overlay/system_fonts/Impact.ttf differ diff --git a/config_repo/overlay/system_fonts/Times_New_Roman.ttf b/config_repo/overlay/system_fonts/Times_New_Roman.ttf new file mode 100644 index 000000000..55f734ab8 Binary files /dev/null and b/config_repo/overlay/system_fonts/Times_New_Roman.ttf differ diff --git a/config_repo/overlay/system_fonts/Times_New_Roman_Bold.ttf b/config_repo/overlay/system_fonts/Times_New_Roman_Bold.ttf new file mode 100644 index 000000000..0fc9d84f9 Binary files /dev/null and b/config_repo/overlay/system_fonts/Times_New_Roman_Bold.ttf differ diff --git a/config_repo/overlay/system_fonts/Times_New_Roman_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Times_New_Roman_Bold_Italic.ttf new file mode 100644 index 000000000..8a6266f69 Binary files /dev/null and b/config_repo/overlay/system_fonts/Times_New_Roman_Bold_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Times_New_Roman_Italic.ttf b/config_repo/overlay/system_fonts/Times_New_Roman_Italic.ttf new file mode 100644 index 000000000..a326a5c51 Binary files /dev/null and b/config_repo/overlay/system_fonts/Times_New_Roman_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS.ttf new file mode 100644 index 000000000..28c30646e Binary files /dev/null and b/config_repo/overlay/system_fonts/Trebuchet_MS.ttf differ diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS_Bold.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS_Bold.ttf new file mode 100644 index 000000000..1ab1ae0ac Binary files /dev/null and b/config_repo/overlay/system_fonts/Trebuchet_MS_Bold.ttf differ diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS_Bold_Italic.ttf new file mode 100644 index 000000000..1ead735ba Binary files /dev/null and b/config_repo/overlay/system_fonts/Trebuchet_MS_Bold_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS_Italic.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS_Italic.ttf new file mode 100644 index 000000000..ab2659ec8 Binary files /dev/null and b/config_repo/overlay/system_fonts/Trebuchet_MS_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Verdana.ttf b/config_repo/overlay/system_fonts/Verdana.ttf new file mode 100644 index 000000000..754a9b7b3 Binary files /dev/null and b/config_repo/overlay/system_fonts/Verdana.ttf differ diff --git a/config_repo/overlay/system_fonts/Verdana_Bold.ttf b/config_repo/overlay/system_fonts/Verdana_Bold.ttf new file mode 100644 index 000000000..a668f13ba Binary files /dev/null and b/config_repo/overlay/system_fonts/Verdana_Bold.ttf differ diff --git a/config_repo/overlay/system_fonts/Verdana_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Verdana_Bold_Italic.ttf new file mode 100644 index 000000000..8be20913b Binary files /dev/null and b/config_repo/overlay/system_fonts/Verdana_Bold_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Verdana_Italic.ttf b/config_repo/overlay/system_fonts/Verdana_Italic.ttf new file mode 100644 index 000000000..fedb5134d Binary files /dev/null and b/config_repo/overlay/system_fonts/Verdana_Italic.ttf differ diff --git a/config_repo/overlay/system_fonts/Webdings.ttf b/config_repo/overlay/system_fonts/Webdings.ttf new file mode 100644 index 000000000..511a319b0 Binary files /dev/null and b/config_repo/overlay/system_fonts/Webdings.ttf differ diff --git a/config_repo/overlay/system_fonts/andalemo.ttf b/config_repo/overlay/system_fonts/andalemo.ttf new file mode 120000 index 000000000..16bac0829 --- /dev/null +++ b/config_repo/overlay/system_fonts/andalemo.ttf @@ -0,0 +1 @@ +Andale_Mono.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/arial.ttf b/config_repo/overlay/system_fonts/arial.ttf new file mode 120000 index 000000000..e626d2829 --- /dev/null +++ b/config_repo/overlay/system_fonts/arial.ttf @@ -0,0 +1 @@ +Arial.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/arialbd.ttf b/config_repo/overlay/system_fonts/arialbd.ttf new file mode 120000 index 000000000..03c34ab95 --- /dev/null +++ b/config_repo/overlay/system_fonts/arialbd.ttf @@ -0,0 +1 @@ +Arial_Bold.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/arialbi.ttf b/config_repo/overlay/system_fonts/arialbi.ttf new file mode 120000 index 000000000..eedeffe35 --- /dev/null +++ b/config_repo/overlay/system_fonts/arialbi.ttf @@ -0,0 +1 @@ +Arial_Bold_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/ariali.ttf b/config_repo/overlay/system_fonts/ariali.ttf new file mode 120000 index 000000000..e879a7f65 --- /dev/null +++ b/config_repo/overlay/system_fonts/ariali.ttf @@ -0,0 +1 @@ +Arial_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/ariblk.ttf b/config_repo/overlay/system_fonts/ariblk.ttf new file mode 120000 index 000000000..859e66d88 --- /dev/null +++ b/config_repo/overlay/system_fonts/ariblk.ttf @@ -0,0 +1 @@ +Arial_Black.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/comic.ttf b/config_repo/overlay/system_fonts/comic.ttf new file mode 120000 index 000000000..2b3055d7a --- /dev/null +++ b/config_repo/overlay/system_fonts/comic.ttf @@ -0,0 +1 @@ +Comic_Sans_MS.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/comicbd.ttf b/config_repo/overlay/system_fonts/comicbd.ttf new file mode 120000 index 000000000..74b59d270 --- /dev/null +++ b/config_repo/overlay/system_fonts/comicbd.ttf @@ -0,0 +1 @@ +Comic_Sans_MS_Bold.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/cour.ttf b/config_repo/overlay/system_fonts/cour.ttf new file mode 120000 index 000000000..f2b638673 --- /dev/null +++ b/config_repo/overlay/system_fonts/cour.ttf @@ -0,0 +1 @@ +Courier_New.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/courbd.ttf b/config_repo/overlay/system_fonts/courbd.ttf new file mode 120000 index 000000000..e65ab74b4 --- /dev/null +++ b/config_repo/overlay/system_fonts/courbd.ttf @@ -0,0 +1 @@ +Courier_New_Bold.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/courbi.ttf b/config_repo/overlay/system_fonts/courbi.ttf new file mode 120000 index 000000000..d245890fa --- /dev/null +++ b/config_repo/overlay/system_fonts/courbi.ttf @@ -0,0 +1 @@ +Courier_New_Bold_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/couri.ttf b/config_repo/overlay/system_fonts/couri.ttf new file mode 120000 index 000000000..0fa0a1835 --- /dev/null +++ b/config_repo/overlay/system_fonts/couri.ttf @@ -0,0 +1 @@ +Courier_New_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/georgia.ttf b/config_repo/overlay/system_fonts/georgia.ttf new file mode 120000 index 000000000..54b4caa43 --- /dev/null +++ b/config_repo/overlay/system_fonts/georgia.ttf @@ -0,0 +1 @@ +Georgia.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/georgiab.ttf b/config_repo/overlay/system_fonts/georgiab.ttf new file mode 120000 index 000000000..1113d2cce --- /dev/null +++ b/config_repo/overlay/system_fonts/georgiab.ttf @@ -0,0 +1 @@ +Georgia_Bold.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/georgiai.ttf b/config_repo/overlay/system_fonts/georgiai.ttf new file mode 120000 index 000000000..c573dcad1 --- /dev/null +++ b/config_repo/overlay/system_fonts/georgiai.ttf @@ -0,0 +1 @@ +Georgia_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/georgiaz.ttf b/config_repo/overlay/system_fonts/georgiaz.ttf new file mode 120000 index 000000000..084ca6efb --- /dev/null +++ b/config_repo/overlay/system_fonts/georgiaz.ttf @@ -0,0 +1 @@ +Georgia_Bold_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/impact.ttf b/config_repo/overlay/system_fonts/impact.ttf new file mode 120000 index 000000000..8acde1481 --- /dev/null +++ b/config_repo/overlay/system_fonts/impact.ttf @@ -0,0 +1 @@ +Impact.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/times.ttf b/config_repo/overlay/system_fonts/times.ttf new file mode 120000 index 000000000..4247b0954 --- /dev/null +++ b/config_repo/overlay/system_fonts/times.ttf @@ -0,0 +1 @@ +Times_New_Roman.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/timesbd.ttf b/config_repo/overlay/system_fonts/timesbd.ttf new file mode 120000 index 000000000..c73c7b8f8 --- /dev/null +++ b/config_repo/overlay/system_fonts/timesbd.ttf @@ -0,0 +1 @@ +Times_New_Roman_Bold.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/timesbi.ttf b/config_repo/overlay/system_fonts/timesbi.ttf new file mode 120000 index 000000000..ba7457478 --- /dev/null +++ b/config_repo/overlay/system_fonts/timesbi.ttf @@ -0,0 +1 @@ +Times_New_Roman_Bold_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/timesi.ttf b/config_repo/overlay/system_fonts/timesi.ttf new file mode 120000 index 000000000..80fb05745 --- /dev/null +++ b/config_repo/overlay/system_fonts/timesi.ttf @@ -0,0 +1 @@ +Times_New_Roman_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/trebuc.ttf b/config_repo/overlay/system_fonts/trebuc.ttf new file mode 120000 index 000000000..71c04b60b --- /dev/null +++ b/config_repo/overlay/system_fonts/trebuc.ttf @@ -0,0 +1 @@ +Trebuchet_MS.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/trebucbd.ttf b/config_repo/overlay/system_fonts/trebucbd.ttf new file mode 120000 index 000000000..7eab7d47a --- /dev/null +++ b/config_repo/overlay/system_fonts/trebucbd.ttf @@ -0,0 +1 @@ +Trebuchet_MS_Bold.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/trebucbi.ttf b/config_repo/overlay/system_fonts/trebucbi.ttf new file mode 120000 index 000000000..64684128f --- /dev/null +++ b/config_repo/overlay/system_fonts/trebucbi.ttf @@ -0,0 +1 @@ +Trebuchet_MS_Bold_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/trebucit.ttf b/config_repo/overlay/system_fonts/trebucit.ttf new file mode 120000 index 000000000..a428b0832 --- /dev/null +++ b/config_repo/overlay/system_fonts/trebucit.ttf @@ -0,0 +1 @@ +Trebuchet_MS_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/verdana.ttf b/config_repo/overlay/system_fonts/verdana.ttf new file mode 120000 index 000000000..bf0dea7a1 --- /dev/null +++ b/config_repo/overlay/system_fonts/verdana.ttf @@ -0,0 +1 @@ +Verdana.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/verdanab.ttf b/config_repo/overlay/system_fonts/verdanab.ttf new file mode 120000 index 000000000..ca639ff54 --- /dev/null +++ b/config_repo/overlay/system_fonts/verdanab.ttf @@ -0,0 +1 @@ +Verdana_Bold.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/verdanai.ttf b/config_repo/overlay/system_fonts/verdanai.ttf new file mode 120000 index 000000000..b481e64df --- /dev/null +++ b/config_repo/overlay/system_fonts/verdanai.ttf @@ -0,0 +1 @@ +Verdana_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/verdanaz.ttf b/config_repo/overlay/system_fonts/verdanaz.ttf new file mode 120000 index 000000000..8357f06b4 --- /dev/null +++ b/config_repo/overlay/system_fonts/verdanaz.ttf @@ -0,0 +1 @@ +Verdana_Bold_Italic.ttf \ No newline at end of file diff --git a/config_repo/overlay/system_fonts/webdings.ttf b/config_repo/overlay/system_fonts/webdings.ttf new file mode 120000 index 000000000..2897adc07 --- /dev/null +++ b/config_repo/overlay/system_fonts/webdings.ttf @@ -0,0 +1 @@ +Webdings.ttf \ No newline at end of file diff --git a/install.sh b/install.sh index 3efa4d002..c71759cca 100755 --- a/install.sh +++ b/install.sh @@ -2953,26 +2953,6 @@ do_update() exit_installation 0 "${STATUS_OK}" "Update completed." } -#### -# Install the Truetype fonts -install_fonts() -{ - declare -n v="${FUNCNAME[0]}" - if [[ ${v} == "true" ]]; then - display_msg --logonly info "Fonts already installed" - return - fi - [[ ${SKIP} == "true" ]] && return - - display_msg --log progress "Installing Truetype fonts." - TMP="${ALLSKY_LOGS}/msttcorefonts.log" - local M="Truetype fonts failed" - run_aptGet msttcorefonts > "${TMP}" 2>&1 - check_success $? "${M}" "${TMP}" "${DEBUG}" || exit_with_image 1 "${STATUS_ERROR}" "${M}" - - STATUS_VARIABLES+=( "${FUNCNAME[0]}='true'\n" ) -} - #### # Install the overlay and modules system install_PHP_modules() @@ -3836,7 +3816,6 @@ set_locale create_allsky_logs "true" # "true" == do everything ##### Install the overlay and modules system and things it needs -install_fonts install_PHP_modules install_Python install_overlay diff --git a/scripts/modules/allsky_overlay.py b/scripts/modules/allsky_overlay.py index c9561a734..3cb6d0d39 100644 --- a/scripts/modules/allsky_overlay.py +++ b/scripts/modules/allsky_overlay.py @@ -442,8 +442,8 @@ def _timer(self, text, showIntermediate=True, showMessage=True): s.log(4, f"INFO: {text} Elapsed time {elapsedTime.total_seconds():.6f} seconds") def _getFont(self, font, fontSize): - - tt = '/usr/share/fonts/truetype/msttcorefonts' + + tt = os.path.join(s.ALLSKY_OVERLAY, 'system_fonts') systemFontMapCased = { 'Arial': {'fontpath': f'{tt}/Arial.ttf'}, 'Arial Black': {'fontpath': f'{tt}/Arial_Black.ttf'},