switch to inter
authorGuillaume Castagnino <casta@xwing.info>
Thu, 12 Sep 2019 14:42:36 +0000 (16:42 +0200)
committerGuillaume Castagnino <casta@xwing.info>
Thu, 12 Sep 2019 14:42:36 +0000 (16:42 +0200)
32 files changed:
dist-font/cm-data/99-font.sh.addon
dist-font/cm-data/inter/.uuid [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Black.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-BlackItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Bold.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-BoldItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-ExtraBold.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-ExtraLight.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Italic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Light.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-LightItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Medium.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-MediumItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Regular.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-SemiBold.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Thin.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-ThinItalic.ttf [new file with mode: 0644]
dist-font/cm-data/open-sans/OpenSans-Bold.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-BoldItalic.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-ExtraBold.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-ExtraBoldItalic.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-Italic.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-Light.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-LightItalic.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-Regular.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-Semibold.ttf [deleted file]
dist-font/cm-data/open-sans/OpenSans-SemiboldItalic.ttf [deleted file]
dist-font/cm.sh

index 81204e79b29957c3cf1e882703a03c33aa7364a2..cd7a317e734e4c2442694a738adaccaf42b8198a 100755 (executable)
@@ -24,16 +24,25 @@ export PATH="${PATH}:$S/bin:$S/xbin"
 
 list_files() {
 cat <<EOF
-fonts/OpenSans-LightItalic.ttf
-fonts/OpenSans-Light.ttf
-fonts/OpenSans-Regular.ttf
-fonts/OpenSans-Italic.ttf
-fonts/OpenSans-SemiboldItalic.ttf
-fonts/OpenSans-Semibold.ttf
-fonts/OpenSans-BoldItalic.ttf
-fonts/OpenSans-Bold.ttf
-fonts/OpenSans-ExtraBoldItalic.ttf
-fonts/OpenSans-ExtraBold.ttf
+fonts/Inter-BlackItalic.ttf
+fonts/Inter-Black.ttf
+fonts/Inter-BoldItalic.ttf
+fonts/Inter-Bold.ttf
+fonts/Inter-ExtraBoldItalic.ttf
+fonts/Inter-ExtraBold.ttf
+fonts/Inter-ExtraLight.ttf
+fonts/Inter-ExtraLightItalic.ttf
+fonts/Inter-Italic.ttf
+fonts/Inter-Light.ttf
+fonts/Inter-LightItalic.ttf
+fonts/Inter-MediumItalic.ttf
+fonts/Inter-Medium.ttf
+fonts/Inter-Regular.ttf
+fonts/Inter-SemiBoldItalic-collapsed.ttf
+fonts/Inter-SemiBoldItalic.ttf
+fonts/Inter-SemiBold.ttf
+fonts/Inter-Thin.ttf
+fonts/Inter-ThinItalic.ttf
 EOF
 }
 
@@ -63,10 +72,7 @@ case "$1" in
     # update fonts.xml
     cp -p "$SYS/etc/fonts.xml" "$SYS/etc/fonts.xml.bak"
     sed -i \
-        -e "s/Roboto-Medium/OpenSans-Semibold/g" \
-        -e "s/Roboto-Black/OpenSans-ExtraBold/g" \
-        -e "/Roboto-Thin/d" \
-        -e "s/Roboto-/OpenSans-/g" \
+        -e "s/Roboto-/Inter-/g" \
         "$SYS/etc/fonts.xml"
     # Fix ownership/permissions
     for i in $(list_files); do
diff --git a/dist-font/cm-data/inter/.uuid b/dist-font/cm-data/inter/.uuid
new file mode 100644 (file)
index 0000000..217b155
--- /dev/null
@@ -0,0 +1 @@
+a4952cd6-992c-4c6f-baea-78feb973ab69
\ No newline at end of file
diff --git a/dist-font/cm-data/inter/Inter-Black.ttf b/dist-font/cm-data/inter/Inter-Black.ttf
new file mode 100644 (file)
index 0000000..b26b119
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-Black.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-BlackItalic.ttf b/dist-font/cm-data/inter/Inter-BlackItalic.ttf
new file mode 100644 (file)
index 0000000..27c02b0
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-BlackItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-Bold.ttf b/dist-font/cm-data/inter/Inter-Bold.ttf
new file mode 100644 (file)
index 0000000..64402b7
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-Bold.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-BoldItalic.ttf b/dist-font/cm-data/inter/Inter-BoldItalic.ttf
new file mode 100644 (file)
index 0000000..ea08781
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-BoldItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraBold.ttf b/dist-font/cm-data/inter/Inter-ExtraBold.ttf
new file mode 100644 (file)
index 0000000..706b93d
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-ExtraBold.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf b/dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf
new file mode 100644 (file)
index 0000000..bd153c2
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraLight.ttf b/dist-font/cm-data/inter/Inter-ExtraLight.ttf
new file mode 100644 (file)
index 0000000..f46ea8f
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-ExtraLight.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf b/dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf
new file mode 100644 (file)
index 0000000..5009b80
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-Italic.ttf b/dist-font/cm-data/inter/Inter-Italic.ttf
new file mode 100644 (file)
index 0000000..3841655
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-Italic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-Light.ttf b/dist-font/cm-data/inter/Inter-Light.ttf
new file mode 100644 (file)
index 0000000..c01d68b
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-Light.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-LightItalic.ttf b/dist-font/cm-data/inter/Inter-LightItalic.ttf
new file mode 100644 (file)
index 0000000..fc48965
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-LightItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-Medium.ttf b/dist-font/cm-data/inter/Inter-Medium.ttf
new file mode 100644 (file)
index 0000000..24e3f1a
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-Medium.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-MediumItalic.ttf b/dist-font/cm-data/inter/Inter-MediumItalic.ttf
new file mode 100644 (file)
index 0000000..75a2f59
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-MediumItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-Regular.ttf b/dist-font/cm-data/inter/Inter-Regular.ttf
new file mode 100644 (file)
index 0000000..8c6943a
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-Regular.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-SemiBold.ttf b/dist-font/cm-data/inter/Inter-SemiBold.ttf
new file mode 100644 (file)
index 0000000..2f5b9d5
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-SemiBold.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf b/dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf
new file mode 100644 (file)
index 0000000..cfb0174
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf b/dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf
new file mode 100644 (file)
index 0000000..652f00b
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-Thin.ttf b/dist-font/cm-data/inter/Inter-Thin.ttf
new file mode 100644 (file)
index 0000000..9a51fdc
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-Thin.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-ThinItalic.ttf b/dist-font/cm-data/inter/Inter-ThinItalic.ttf
new file mode 100644 (file)
index 0000000..2a134d8
Binary files /dev/null and b/dist-font/cm-data/inter/Inter-ThinItalic.ttf differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-Bold.ttf b/dist-font/cm-data/open-sans/OpenSans-Bold.ttf
deleted file mode 100644 (file)
index fd79d43..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-Bold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-BoldItalic.ttf b/dist-font/cm-data/open-sans/OpenSans-BoldItalic.ttf
deleted file mode 100644 (file)
index 9bc8009..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-BoldItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-ExtraBold.ttf b/dist-font/cm-data/open-sans/OpenSans-ExtraBold.ttf
deleted file mode 100644 (file)
index 21f6f84..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-ExtraBold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-ExtraBoldItalic.ttf b/dist-font/cm-data/open-sans/OpenSans-ExtraBoldItalic.ttf
deleted file mode 100644 (file)
index 31cb688..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-Italic.ttf b/dist-font/cm-data/open-sans/OpenSans-Italic.ttf
deleted file mode 100644 (file)
index c90da48..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-Italic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-Light.ttf b/dist-font/cm-data/open-sans/OpenSans-Light.ttf
deleted file mode 100644 (file)
index 43edbe1..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-Light.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-LightItalic.ttf b/dist-font/cm-data/open-sans/OpenSans-LightItalic.ttf
deleted file mode 100644 (file)
index 68299c4..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-LightItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-Regular.ttf b/dist-font/cm-data/open-sans/OpenSans-Regular.ttf
deleted file mode 100644 (file)
index db43334..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-Regular.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-Semibold.ttf b/dist-font/cm-data/open-sans/OpenSans-Semibold.ttf
deleted file mode 100644 (file)
index 1a7679e..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-Semibold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/open-sans/OpenSans-SemiboldItalic.ttf b/dist-font/cm-data/open-sans/OpenSans-SemiboldItalic.ttf
deleted file mode 100644 (file)
index 59b6d16..0000000
Binary files a/dist-font/cm-data/open-sans/OpenSans-SemiboldItalic.ttf and /dev/null differ
index 03989d1ddea021c4ebe23824bd7c6d4f3bddd273..86f899ddd903e5f9d44f1aadaa5136fc446de545 100755 (executable)
@@ -10,9 +10,9 @@ export PATH="${PATH}:${SYSTEM}/bin:${SYSTEM}/xbin"
 
 # install iptables script
 echo "Installing font"
-cp cm-data/open-sans/OpenSans-*.ttf ${SYSTEM}/fonts/
-chown root:root ${SYSTEM}/fonts/OpenSans-*.ttf
-chmod 750 ${SYSTEM}/fonts/OpenSans-*.ttf
+cp cm-data/inter/Inter-*.ttf ${SYSTEM}/fonts/
+chown root:root ${SYSTEM}/fonts/Inter-*.ttf
+chmod 750 ${SYSTEM}/fonts/Inter-*.ttf
 
 # install restore script
 echo "Installing restore script"