1 files changed, 20 insertions, 11 deletions
diff --git a/system/fira-fonts/fira-fonts.SlackBuild b/system/fira-fonts/fira-fonts.SlackBuild
index be9f2b1f04..a41a88e79f 100644
--- a/system/fira-fonts/fira-fonts.SlackBuild
+++ b/system/fira-fonts/fira-fonts.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fira-fonts
-VERSION=${VERSION:-4.106}
+VERSION=${VERSION:-4.301}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,7 +36,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 # variables to handle the source archive naming
 # sans font version
-SANS_VER=4106
+SANS_VER=4301
 # mono font version
 MONO_VER=3206
 
@@ -50,26 +50,35 @@ mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
 # extract downloaded fonts
-unzip $CWD/FiraFonts$SANS_VER.zip
+unzip $CWD/Download_Folder_FiraSans_$SANS_VER.zip
 unzip $CWD/FiraMonoFonts$MONO_VER.zip
+# clean up dir names
+mv Download_Folder_FiraSans_$SANS_VER FiraSans$SANS_VER
+mv FiraMonoFonts$MONO_VER FiraMono$MONO_VER
 
 chown -R root:root .
 find -L . \
-     \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-     -o -perm 511 \) -exec chmod 755 {} \; -o \
-     \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/OTF
-# copy sans fonts
-cp -a FiraFonts$SANS_VER/OTF/*.otf $PKG/usr/share/fonts/OTF
+# copy sans OTF fonts
+find FiraSans$SANS_VER/Fonts -type f -iname "*.otf" \
+     -exec cp '{}' $PKG/usr/share/fonts/OTF \;
+
 # copy mono fonts
-cp -a FiraMonoFonts$MONO_VER/OTF/*.otf $PKG/usr/share/fonts/OTF
+cp -a FiraMono$MONO_VER/OTF/*.otf $PKG/usr/share/fonts/OTF
 
 # Copy documentation in to package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a FiraFonts$SANS_VER/License.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a FiraSans$SANS_VER/Fira_4_3_Change_Log.rtf \
+   FiraSans$SANS_VER/Technical\ Report\ PDF/Technical_Report*.pdf \
+   $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a FiraMono$MONO_VER/License.txt $PKG/usr/doc/$PRGNAM-$VERSION
 chmod -x $PKG/usr/doc/$PRGNAM-$VERSION/License.txt
+
 # and the SlackBuild
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild