issue#141

Fix favicons links Remove broken links Fix "redundant data" error after zimcheck
openzim · Dec 23, 2022 · 0884108 · 0884108
1 parent 41e8c0d
commit 0884108
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/res/template.html b/res/template.html
@@ -5,25 +5,23 @@
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi">
-	<link rel="apple-touch-icon" sizes="57x57" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="60x60" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="72x72" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="76x76" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="114x114" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="120x120" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="144x144" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="152x152" href="favicon.ico">
-	<link rel="apple-touch-icon" sizes="180x180" href="favicon.ico">
-	<link rel="icon" type="image/ico" href="favicon.ico" sizes="32x32">
-	<link rel="icon" type="image/ico" href="favicon.ico" sizes="192x192">
-	<link rel="icon" type="image/ico" href="favicon.ico" sizes="96x96">
-	<link rel="icon" type="image/ico" href="favicon.ico" sizes="16x16">
-	<link rel="manifest" href="manifest.json">
+	<link rel="apple-touch-icon" sizes="57x57" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="60x60" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="72x72" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="76x76" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="114x114" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="120x120" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="144x144" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="152x152" href="../-/favicon.ico">
+	<link rel="apple-touch-icon" sizes="180x180" href="../-/favicon.ico">
+	<link rel="icon" type="image/ico" href="../-/favicon.ico" sizes="32x32">
+	<link rel="icon" type="image/ico" href="../-/favicon.ico" sizes="192x192">
+	<link rel="icon" type="image/ico" href="../-/favicon.ico" sizes="96x96">
+	<link rel="icon" type="image/ico" href="../-/favicon.ico" sizes="16x16">
 	<title>PhET INTERACTIVE SIMULATIONS</title>
 	<meta name="theme-color" content="#ffffff">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<link href="../-/index.css" type="text/css" rel="stylesheet">
-	<!--<link href="font-awesome.min.css" type="text/css" rel="stylesheet">-->
 	<link href="../-/sweetalert2.min.css" type="text/css" rel="stylesheet">
 	<script src='../-/set.js'></script>
 	<script src='../-/ractive.js'></script>

diff --git a/steps/export.ts b/steps/export.ts
@@ -138,7 +138,7 @@ const exportTarget = async (target: Target) => {
   // Generate catalog JS
   await fs.promises.writeFile(targetDir + 'catalog.js', catalogJs(catalog, target.output), 'utf8');
 
-  await Promise.all(glob.sync(`${resDir}/**/*`, {ignore: ['*/templates/*', '*.ts', 'template.html'], nodir: true})
+  await Promise.all(glob.sync(`${resDir}/**/*`, {ignore: ['*/templates/*', '*.ts', '*/template.html'], nodir: true})
     .map(async (file) => fs.promises.copyFile(file, `${targetDir}${path.basename(file)}`))
   );