Merge pull request #4132 from AllskyTeam/4131-move-truetype-fonts-int…

…o-main-codebase-sourceforge-has-ssl-errors 4131 move truetype fonts into main codebase sourceforge has ssl errors
AllskyTeam · Dec 28, 2024 · a26f865 · a26f865
2 parents 9b96e27 + 9c037d4
commit a26f865
Show file tree

Hide file tree

Showing 62 changed files with 32 additions and 23 deletions.
diff --git a/config_repo/overlay/system_fonts/Andale_Mono.ttf b/config_repo/overlay/system_fonts/Andale_Mono.ttf
diff --git a/config_repo/overlay/system_fonts/Arial.ttf b/config_repo/overlay/system_fonts/Arial.ttf
diff --git a/config_repo/overlay/system_fonts/Arial_Black.ttf b/config_repo/overlay/system_fonts/Arial_Black.ttf
diff --git a/config_repo/overlay/system_fonts/Arial_Bold.ttf b/config_repo/overlay/system_fonts/Arial_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/Arial_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Arial_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Arial_Italic.ttf b/config_repo/overlay/system_fonts/Arial_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Comic_Sans_MS.ttf b/config_repo/overlay/system_fonts/Comic_Sans_MS.ttf
diff --git a/config_repo/overlay/system_fonts/Comic_Sans_MS_Bold.ttf b/config_repo/overlay/system_fonts/Comic_Sans_MS_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/Courier_New.ttf b/config_repo/overlay/system_fonts/Courier_New.ttf
diff --git a/config_repo/overlay/system_fonts/Courier_New_Bold.ttf b/config_repo/overlay/system_fonts/Courier_New_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/Courier_New_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Courier_New_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Courier_New_Italic.ttf b/config_repo/overlay/system_fonts/Courier_New_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Georgia.ttf b/config_repo/overlay/system_fonts/Georgia.ttf
diff --git a/config_repo/overlay/system_fonts/Georgia_Bold.ttf b/config_repo/overlay/system_fonts/Georgia_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/Georgia_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Georgia_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Georgia_Italic.ttf b/config_repo/overlay/system_fonts/Georgia_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Impact.ttf b/config_repo/overlay/system_fonts/Impact.ttf
diff --git a/config_repo/overlay/system_fonts/Times_New_Roman.ttf b/config_repo/overlay/system_fonts/Times_New_Roman.ttf
diff --git a/config_repo/overlay/system_fonts/Times_New_Roman_Bold.ttf b/config_repo/overlay/system_fonts/Times_New_Roman_Bold.ttf
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
diff --git a/config_repo/overlay/system_fonts/Times_New_Roman_Italic.ttf b/config_repo/overlay/system_fonts/Times_New_Roman_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS.ttf
diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS_Bold.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Trebuchet_MS_Italic.ttf b/config_repo/overlay/system_fonts/Trebuchet_MS_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Verdana.ttf b/config_repo/overlay/system_fonts/Verdana.ttf
diff --git a/config_repo/overlay/system_fonts/Verdana_Bold.ttf b/config_repo/overlay/system_fonts/Verdana_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/Verdana_Bold_Italic.ttf b/config_repo/overlay/system_fonts/Verdana_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Verdana_Italic.ttf b/config_repo/overlay/system_fonts/Verdana_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/Webdings.ttf b/config_repo/overlay/system_fonts/Webdings.ttf
diff --git a/config_repo/overlay/system_fonts/andalemo.ttf b/config_repo/overlay/system_fonts/andalemo.ttf
@@ -0,0 +1 @@
+Andale_Mono.ttf
diff --git a/config_repo/overlay/system_fonts/arial.ttf b/config_repo/overlay/system_fonts/arial.ttf
@@ -0,0 +1 @@
+Arial.ttf
diff --git a/config_repo/overlay/system_fonts/arialbd.ttf b/config_repo/overlay/system_fonts/arialbd.ttf
@@ -0,0 +1 @@
+Arial_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/arialbi.ttf b/config_repo/overlay/system_fonts/arialbi.ttf
@@ -0,0 +1 @@
+Arial_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/ariali.ttf b/config_repo/overlay/system_fonts/ariali.ttf
@@ -0,0 +1 @@
+Arial_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/ariblk.ttf b/config_repo/overlay/system_fonts/ariblk.ttf
@@ -0,0 +1 @@
+Arial_Black.ttf
diff --git a/config_repo/overlay/system_fonts/comic.ttf b/config_repo/overlay/system_fonts/comic.ttf
@@ -0,0 +1 @@
+Comic_Sans_MS.ttf
diff --git a/config_repo/overlay/system_fonts/comicbd.ttf b/config_repo/overlay/system_fonts/comicbd.ttf
@@ -0,0 +1 @@
+Comic_Sans_MS_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/cour.ttf b/config_repo/overlay/system_fonts/cour.ttf
@@ -0,0 +1 @@
+Courier_New.ttf
diff --git a/config_repo/overlay/system_fonts/courbd.ttf b/config_repo/overlay/system_fonts/courbd.ttf
@@ -0,0 +1 @@
+Courier_New_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/courbi.ttf b/config_repo/overlay/system_fonts/courbi.ttf
@@ -0,0 +1 @@
+Courier_New_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/couri.ttf b/config_repo/overlay/system_fonts/couri.ttf
@@ -0,0 +1 @@
+Courier_New_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/georgia.ttf b/config_repo/overlay/system_fonts/georgia.ttf
@@ -0,0 +1 @@
+Georgia.ttf
diff --git a/config_repo/overlay/system_fonts/georgiab.ttf b/config_repo/overlay/system_fonts/georgiab.ttf
@@ -0,0 +1 @@
+Georgia_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/georgiai.ttf b/config_repo/overlay/system_fonts/georgiai.ttf
@@ -0,0 +1 @@
+Georgia_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/georgiaz.ttf b/config_repo/overlay/system_fonts/georgiaz.ttf
@@ -0,0 +1 @@
+Georgia_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/impact.ttf b/config_repo/overlay/system_fonts/impact.ttf
@@ -0,0 +1 @@
+Impact.ttf
diff --git a/config_repo/overlay/system_fonts/times.ttf b/config_repo/overlay/system_fonts/times.ttf
@@ -0,0 +1 @@
+Times_New_Roman.ttf
diff --git a/config_repo/overlay/system_fonts/timesbd.ttf b/config_repo/overlay/system_fonts/timesbd.ttf
@@ -0,0 +1 @@
+Times_New_Roman_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/timesbi.ttf b/config_repo/overlay/system_fonts/timesbi.ttf
@@ -0,0 +1 @@
+Times_New_Roman_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/timesi.ttf b/config_repo/overlay/system_fonts/timesi.ttf
@@ -0,0 +1 @@
+Times_New_Roman_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/trebuc.ttf b/config_repo/overlay/system_fonts/trebuc.ttf
@@ -0,0 +1 @@
+Trebuchet_MS.ttf
diff --git a/config_repo/overlay/system_fonts/trebucbd.ttf b/config_repo/overlay/system_fonts/trebucbd.ttf
@@ -0,0 +1 @@
+Trebuchet_MS_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/trebucbi.ttf b/config_repo/overlay/system_fonts/trebucbi.ttf
@@ -0,0 +1 @@
+Trebuchet_MS_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/trebucit.ttf b/config_repo/overlay/system_fonts/trebucit.ttf
@@ -0,0 +1 @@
+Trebuchet_MS_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/verdana.ttf b/config_repo/overlay/system_fonts/verdana.ttf
@@ -0,0 +1 @@
+Verdana.ttf
diff --git a/config_repo/overlay/system_fonts/verdanab.ttf b/config_repo/overlay/system_fonts/verdanab.ttf
@@ -0,0 +1 @@
+Verdana_Bold.ttf
diff --git a/config_repo/overlay/system_fonts/verdanai.ttf b/config_repo/overlay/system_fonts/verdanai.ttf
@@ -0,0 +1 @@
+Verdana_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/verdanaz.ttf b/config_repo/overlay/system_fonts/verdanaz.ttf
@@ -0,0 +1 @@
+Verdana_Bold_Italic.ttf
diff --git a/config_repo/overlay/system_fonts/webdings.ttf b/config_repo/overlay/system_fonts/webdings.ttf
@@ -0,0 +1 @@
+Webdings.ttf
diff --git 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
@@ -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'},