Update WuppiMini, Add TiVuOcto, Update Build.sh

octospacc · Jul 30, 2024 · 260dc1e · 260dc1e
1 parent 53204d0
commit 260dc1e
Show file tree

Hide file tree

Showing 16 changed files with 2,023 additions and 897 deletions.
diff --git a/Build.sh b/Build.sh
@@ -1,13 +1,14 @@
 #!/bin/sh
-SourceApps="SpiderADB WuppiMini"
+SourceApps="SpiderADB TiVuOcto WuppiMini"
 HubSdkApps="${SourceApps} MatrixStickerHelper TiktOctt"
+HtmlHeadInject='<script src="../../shared/OctoHub-Global.js"></script>'
 
 quoteVar(){ echo '"'"$1"'"' ;}
 
 getMetaAttr(){
 	file="$1"
 	name="$2"
-	key="$([ -n "$3" ] && echo "$3" || echo "property")"
+	key="$([ -n "$3" ] && echo "$3" || echo property)"
 	grep '<meta '"$key"'="'"$name"'"' "$file" | grep '>' | cut -d '"' -f4
 }
 
@@ -30,9 +31,9 @@ node ../WriteRedirectPages.js
 for App in ${HubSdkApps}
 do
 	file="./${App}/index.html"
-	name="$(getMetaAttr "${file}" og:title)"
-	description="$(getMetaAttr "${file}" og:description property)"
-	url="$(getMetaAttr "${file}" Url OctoSpaccHubSdk)" #"$(getMetaAttr "${file}" og:url property)"
+	name="$(       getMetaAttr "${file}" og:title)"
+	description="$(getMetaAttr "${file}" og:description)"
+	url="$(        getMetaAttr "${file}" Url OctoSpaccHubSdk)"
 	cat << [OctoSpaccHubSdk-WebManifest-EOF] > "./${App}/WebManifest.json"
 	{
 		$(getMetaAttr "${file}" WebManifestExtra OctoSpaccHubSdk | sed s/\'/\"/g)
@@ -42,5 +43,7 @@ do
 		"name": "${name}"
 	}
 [OctoSpaccHubSdk-WebManifest-EOF]
-	sed -i 's|</head>|<title>'"${name}"'</title><link rel="manifest" href="./WebManifest.json"/></head>|' "${file}"
+	htmltitle='<title>'"${name}"'</title>'
+	htmlcanonical='<link rel="canonical" href="'"${url}"'"/>'
+	sed -i 's|</head>|<link rel="manifest" href="./WebManifest.json"/>'"${htmltitle}${htmlcanonical}${htmlmanifest}${HtmlHeadInject}"'</head>|' "${file}"
 done
diff --git a/package-lock.json b/package-lock.json
diff --git a/source/SpiderADB/index.html b/source/SpiderADB/index.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8"/>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-	<meta property="og:title" content="🕷️ SpiderADB"/>
+	<meta property="og:title" content="SpiderADB"/>
 	<meta OctoSpaccHubSdk="Url" content="https://hub.octt.eu.org/SpiderADB/"/>
 	<meta OctoSpaccHubSdk="WebManifestExtra" content="'display':'standalone', 'icons':[{ 'src':'./icon.png', 'type':'image/png', 'sizes':'512x512' }],"/>
 	<link rel="apple-touch-icon" href="./icon.png"/>
@@ -15,7 +15,6 @@
 	<script src="./util.js"></script>
 	<script src="./holo-web/holo-extra-octt.js"></script>
 	<script src="./holo-web/holo-touch.js"></script>
-	<script src="../../shared/OctoHub-Global.js"></script>
 	<style>
 		.floatRight { float: right; }
 		body { overflow-x: hidden; padding-bottom: 0; overflow-wrap: break-word; }

diff --git a/source/SpiderADB/package-lock.json b/source/SpiderADB/package-lock.json
diff --git a/source/TiVuOcto/Build.sh b/source/TiVuOcto/Build.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo index.html node_modules
diff --git a/source/TiVuOcto/Requirements.sh b/source/TiVuOcto/Requirements.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+npm update
+npm install