switch back to ibn plex
authorGuillaume Castagnino <casta@xwing.info>
Fri, 1 Nov 2019 22:03:39 +0000 (23:03 +0100)
committerGuillaume Castagnino <casta@xwing.info>
Fri, 1 Nov 2019 22:03:39 +0000 (23:03 +0100)
37 files changed:
dist-font/cm-data/99-font.sh.addon
dist-font/cm-data/IBMPlexSans/IBMPlexSans-Bold.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-BoldItalic.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLight.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLightItalic.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-Italic.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-Light.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-LightItalic.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-Medium.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-MediumItalic.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-Regular.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBold.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBoldItalic.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-Text.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-TextItalic.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-Thin.ttf [new file with mode: 0644]
dist-font/cm-data/IBMPlexSans/IBMPlexSans-ThinItalic.ttf [new file with mode: 0644]
dist-font/cm-data/inter/Inter-Black.ttf [deleted file]
dist-font/cm-data/inter/Inter-BlackItalic.ttf [deleted file]
dist-font/cm-data/inter/Inter-Bold.ttf [deleted file]
dist-font/cm-data/inter/Inter-BoldItalic.ttf [deleted file]
dist-font/cm-data/inter/Inter-ExtraBold.ttf [deleted file]
dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf [deleted file]
dist-font/cm-data/inter/Inter-ExtraLight.ttf [deleted file]
dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf [deleted file]
dist-font/cm-data/inter/Inter-Italic.ttf [deleted file]
dist-font/cm-data/inter/Inter-Light.ttf [deleted file]
dist-font/cm-data/inter/Inter-LightItalic.ttf [deleted file]
dist-font/cm-data/inter/Inter-Medium.ttf [deleted file]
dist-font/cm-data/inter/Inter-MediumItalic.ttf [deleted file]
dist-font/cm-data/inter/Inter-Regular.ttf [deleted file]
dist-font/cm-data/inter/Inter-SemiBold.ttf [deleted file]
dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf [deleted file]
dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf [deleted file]
dist-font/cm-data/inter/Inter-Thin.ttf [deleted file]
dist-font/cm-data/inter/Inter-ThinItalic.ttf [deleted file]
dist-font/cm.sh

index cd7a317e734e4c2442694a738adaccaf42b8198a..53fb86a17e92c2de9dbe5792c1312fecb0ad82c1 100755 (executable)
@@ -24,25 +24,24 @@ export PATH="${PATH}:$S/bin:$S/xbin"
 
 list_files() {
 cat <<EOF
-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
+fonts/IBMPlexSans-Black.ttf
+fonts/IBMPlexSans-BlackItalic.ttf
+fonts/IBMPlexSans-Bold.ttf
+fonts/IBMPlexSans-BoldItalic.ttf
+fonts/IBMPlexSans-Hairline.ttf
+fonts/IBMPlexSans-HairlineItalic.ttf
+fonts/IBMPlexSans-Heavy.ttf
+fonts/IBMPlexSans-HeavyItalic.ttf
+fonts/IBMPlexSans-Italic.ttf
+fonts/IBMPlexSans-Light.ttf
+fonts/IBMPlexSans-LightItalic.ttf
+fonts/IBMPlexSans-Medium.ttf
+fonts/IBMPlexSans-MediumItalic.ttf
+fonts/IBMPlexSans-Regular.ttf
+fonts/IBMPlexSans-Semibold.ttf
+fonts/IBMPlexSans-SemiboldItalic.ttf
+fonts/IBMPlexSans-Thin.ttf
+fonts/IBMPlexSans-ThinItalic.ttf
 EOF
 }
 
@@ -72,7 +71,7 @@ case "$1" in
     # update fonts.xml
     cp -p "$SYS/etc/fonts.xml" "$SYS/etc/fonts.xml.bak"
     sed -i \
-        -e "s/Roboto-/Inter-/g" \
+        -e "s/Roboto-/IBMPlexSans-/g" \
         "$SYS/etc/fonts.xml"
     # Fix ownership/permissions
     for i in $(list_files); do
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Bold.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Bold.ttf
new file mode 100644 (file)
index 0000000..eba206b
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Bold.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-BoldItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-BoldItalic.ttf
new file mode 100644 (file)
index 0000000..7f69bff
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-BoldItalic.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLight.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLight.ttf
new file mode 100644 (file)
index 0000000..187fcac
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLight.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLightItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLightItalic.ttf
new file mode 100644 (file)
index 0000000..e9e6871
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLightItalic.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Italic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Italic.ttf
new file mode 100644 (file)
index 0000000..c690ee7
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Italic.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Light.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Light.ttf
new file mode 100644 (file)
index 0000000..6cee3f5
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Light.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-LightItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-LightItalic.ttf
new file mode 100644 (file)
index 0000000..807554e
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-LightItalic.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Medium.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Medium.ttf
new file mode 100644 (file)
index 0000000..79271e6
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Medium.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-MediumItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-MediumItalic.ttf
new file mode 100644 (file)
index 0000000..f78e202
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-MediumItalic.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Regular.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Regular.ttf
new file mode 100644 (file)
index 0000000..705fdf6
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Regular.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBold.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBold.ttf
new file mode 100644 (file)
index 0000000..a01c128
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBold.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBoldItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBoldItalic.ttf
new file mode 100644 (file)
index 0000000..d5ac121
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBoldItalic.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Text.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Text.ttf
new file mode 100644 (file)
index 0000000..b39f143
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Text.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-TextItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-TextItalic.ttf
new file mode 100644 (file)
index 0000000..fecc568
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-TextItalic.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Thin.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Thin.ttf
new file mode 100644 (file)
index 0000000..086f5b7
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Thin.ttf differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ThinItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ThinItalic.ttf
new file mode 100644 (file)
index 0000000..e33878b
Binary files /dev/null and b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ThinItalic.ttf differ
diff --git a/dist-font/cm-data/inter/Inter-Black.ttf b/dist-font/cm-data/inter/Inter-Black.ttf
deleted file mode 100644 (file)
index b26b119..0000000
Binary files a/dist-font/cm-data/inter/Inter-Black.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-BlackItalic.ttf b/dist-font/cm-data/inter/Inter-BlackItalic.ttf
deleted file mode 100644 (file)
index 27c02b0..0000000
Binary files a/dist-font/cm-data/inter/Inter-BlackItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-Bold.ttf b/dist-font/cm-data/inter/Inter-Bold.ttf
deleted file mode 100644 (file)
index 64402b7..0000000
Binary files a/dist-font/cm-data/inter/Inter-Bold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-BoldItalic.ttf b/dist-font/cm-data/inter/Inter-BoldItalic.ttf
deleted file mode 100644 (file)
index ea08781..0000000
Binary files a/dist-font/cm-data/inter/Inter-BoldItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraBold.ttf b/dist-font/cm-data/inter/Inter-ExtraBold.ttf
deleted file mode 100644 (file)
index 706b93d..0000000
Binary files a/dist-font/cm-data/inter/Inter-ExtraBold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf b/dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf
deleted file mode 100644 (file)
index bd153c2..0000000
Binary files a/dist-font/cm-data/inter/Inter-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraLight.ttf b/dist-font/cm-data/inter/Inter-ExtraLight.ttf
deleted file mode 100644 (file)
index f46ea8f..0000000
Binary files a/dist-font/cm-data/inter/Inter-ExtraLight.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf b/dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf
deleted file mode 100644 (file)
index 5009b80..0000000
Binary files a/dist-font/cm-data/inter/Inter-ExtraLightItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-Italic.ttf b/dist-font/cm-data/inter/Inter-Italic.ttf
deleted file mode 100644 (file)
index 3841655..0000000
Binary files a/dist-font/cm-data/inter/Inter-Italic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-Light.ttf b/dist-font/cm-data/inter/Inter-Light.ttf
deleted file mode 100644 (file)
index c01d68b..0000000
Binary files a/dist-font/cm-data/inter/Inter-Light.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-LightItalic.ttf b/dist-font/cm-data/inter/Inter-LightItalic.ttf
deleted file mode 100644 (file)
index fc48965..0000000
Binary files a/dist-font/cm-data/inter/Inter-LightItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-Medium.ttf b/dist-font/cm-data/inter/Inter-Medium.ttf
deleted file mode 100644 (file)
index 24e3f1a..0000000
Binary files a/dist-font/cm-data/inter/Inter-Medium.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-MediumItalic.ttf b/dist-font/cm-data/inter/Inter-MediumItalic.ttf
deleted file mode 100644 (file)
index 75a2f59..0000000
Binary files a/dist-font/cm-data/inter/Inter-MediumItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-Regular.ttf b/dist-font/cm-data/inter/Inter-Regular.ttf
deleted file mode 100644 (file)
index 8c6943a..0000000
Binary files a/dist-font/cm-data/inter/Inter-Regular.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-SemiBold.ttf b/dist-font/cm-data/inter/Inter-SemiBold.ttf
deleted file mode 100644 (file)
index 2f5b9d5..0000000
Binary files a/dist-font/cm-data/inter/Inter-SemiBold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf b/dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf
deleted file mode 100644 (file)
index cfb0174..0000000
Binary files a/dist-font/cm-data/inter/Inter-SemiBoldItalic-collapsed.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf b/dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf
deleted file mode 100644 (file)
index 652f00b..0000000
Binary files a/dist-font/cm-data/inter/Inter-SemiBoldItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-Thin.ttf b/dist-font/cm-data/inter/Inter-Thin.ttf
deleted file mode 100644 (file)
index 9a51fdc..0000000
Binary files a/dist-font/cm-data/inter/Inter-Thin.ttf and /dev/null differ
diff --git a/dist-font/cm-data/inter/Inter-ThinItalic.ttf b/dist-font/cm-data/inter/Inter-ThinItalic.ttf
deleted file mode 100644 (file)
index 2a134d8..0000000
Binary files a/dist-font/cm-data/inter/Inter-ThinItalic.ttf and /dev/null differ
index 86f899ddd903e5f9d44f1aadaa5136fc446de545..35cafbce171c049523b03bb67fde8f08b75e0d0e 100755 (executable)
@@ -10,9 +10,9 @@ export PATH="${PATH}:${SYSTEM}/bin:${SYSTEM}/xbin"
 
 # install iptables script
 echo "Installing font"
-cp cm-data/inter/Inter-*.ttf ${SYSTEM}/fonts/
-chown root:root ${SYSTEM}/fonts/Inter-*.ttf
-chmod 750 ${SYSTEM}/fonts/Inter-*.ttf
+cp cm-data/IBMPlexSans/IBMPlexSans*.ttf ${SYSTEM}/fonts/
+chown root:root ${SYSTEM}/fonts/IBMPlexSans*.ttf
+chmod 750 ${SYSTEM}/fonts/IBMPlexSans*.ttf
 
 # install restore script
 echo "Installing restore script"