feat: Add script to get fonts on build

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Dec 8, 2023 · 2f7e4d0 · 2f7e4d0
1 parent 1a3411f
commit 2f7e4d0
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/assets/fonts
 tests/clover.xml
 .idea
 node_modules/

diff --git a/.nextcloudignore b/.nextcloudignore
@@ -1,4 +1,5 @@
 src
+build
 .git
 tests
 node_modules

diff --git a/assets/fonts/.gitkeep b/assets/fonts/.gitkeep
@@ -0,0 +1 @@
+Fonts will be added here during release build thorugh the build/download-fonts.sh script.
diff --git a/assets/fonts/AmaticSC-Regular.ttf b/assets/fonts/AmaticSC-Regular.ttf
diff --git a/krankerl.toml b/krankerl.toml
@@ -2,6 +2,7 @@
 before_cmds = [
 	"composer install --working-dir=composer/",
 	"composer dump --working-dir=composer/",
+	"./build/download-fonts.sh",
 	"npm ci",
 	"npm run build"
 ]
diff --git a/lib/Migration/InstallDefaultFonts.php b/lib/Migration/InstallDefaultFonts.php
@@ -18,7 +18,7 @@ public function getName(): string {
 	public function run(IOutput $output): void {
 		$appVersion = $this->config->getAppValue('richdocuments', 'installed_version');
 
-		if (!empty($appVersion) && version_compare($appVersion, '8.2.2') < 1) {
+		if (empty($appVersion) || version_compare($appVersion, '8.3.0', '>')) {
 			return;
 		}
 

diff --git a/lib/Service/FontService.php b/lib/Service/FontService.php
@@ -261,7 +261,7 @@ public function installDefaultFonts(): void {
 		}
 
 		while (false !== ($fileName = readdir($handle))) {
-			if ($fileName === '.' || $fileName === '..') {
+			if (\str_starts_with($fileName, '.') || \str_ends_with($fileName, '.txt')) {
 				continue;
 			}
 

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
@@ -527,7 +527,7 @@ export default {
 		fontXmlHint() {
 			return `
 <remote_font_config>
-	<url desc="URL of optional JSON file that lists fonts to be included in Online" type="string" default="">${this.fontHintUrl}</url>
+	<url>${this.fontHintUrl}</url>
 </remote_font_config>
 			`
 		},