system/grub2: Build a graphical terminal font.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

5 files changed, 30 insertions, 37 deletions

diff --git a/system/grub2/README b/system/grub2/README
index 0079f7d26bc2e..3c3ba67079994 100644
--- a/system/grub2/README
+++ b/system/grub2/README
@@ -2,13 +2,8 @@ GRUB2 (the GRand Unified Bootloader)
 
 GNU GRUB is a multiboot boot loader.
 
-If you want to use a big font in a graphical terminal of grub2,
-try the below command.
-grub-mkfont -o /usr/share/grub/unifont.pf2 -abv -s [font size] /usr/share/
-fonts/unifont/unifont.ttf
+If you want to set the size of font then give FONT_SIZE=size
+option to the list of build options.
+The default size is 16.
 
-If you want to use a fixed sized small font in gfxterm,
-try this. grub-mkfont -o /usr/share/grub/unifont.pf2 -v /usr/share/fonts/
-unifont/unifont.pcf.gz
-
-Requires: osprober unifont help2man
\ No newline at end of file
+This requires osprober, unifont, and help2man.
diff --git a/system/grub2/doinst.sh b/system/grub2/doinst.sh
index 6e0020b4b941d..92eb273a899fc 100644
--- a/system/grub2/doinst.sh
+++ b/system/grub2/doinst.sh
@@ -10,5 +10,3 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-
-
diff --git a/system/grub2/grub.info b/system/grub2/grub.INFO
index 643b302fd24f3..643b302fd24f3 100644
--- a/system/grub2/grub.info
+++ b/system/grub2/grub.INFO
diff --git a/system/grub2/grub2.SlackBuild b/system/grub2/grub2.SlackBuild
index c1ab43344eb4a..8291739afb0fa 100644
--- a/system/grub2/grub2.SlackBuild
+++ b/system/grub2/grub2.SlackBuild
@@ -1,14 +1,13 @@
 #!/bin/sh
 
-# Slackware build script for grub
+# Slackware build script for grub2
 
 # Written by crocket (crockabiscuit@yahoo.com)
-# Modified by the SlackBuilds.org project.
 
 PRGNAM=grub2
-SRCNAM=grub
+ARCNAM=grub
 VERSION=${VERSION:-1.98}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -26,6 +25,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+FONT_SIZE=${FONT_SIZE:-16}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -45,9 +46,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $ARCNAM-$VERSION
+tar xvf $CWD/$ARCNAM-$VERSION.tar.gz
+cd $ARCNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,41 +75,40 @@ cat $CWD/etc.default.grub > $PKG/etc/default/grub
 sed "s#/usr/lib#/usr/lib${LIBDIRSUFFIX}#" \
   $CWD/05_debian_theme > $PKG/etc/grub.d/05_debian_theme
 
-# Don't strip the files it breaks module loading.
+# Don't strip the files because it breaks module loading.
 #find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 #  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# convert gnu-unifont to a font useable by grub2 gfxterm.
+$PKG/usr/bin/grub-mkfont -o $PKG/usr/share/grub/unifont.pf2 -abv \
+  -s $FONT_SIZE /usr/share/fonts/TTF/unifont.ttf
+
 # Copy a snapshot version of grub2 info since the current version's is deficient.
-cat $CWD/grub.info > $PKG/usr/info/grub.info
+cat $CWD/grub.INFO > $PKG/usr/info/grub.info
 gzip -9 $PKG/usr/info/*.info*
 rm -f $PKG/usr/info/dir
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO docs/grub.cfg \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Add .new extension to all configuration files.
+# Add .new extension to all configuration files
+# and add them to doinst.sh
 for file in $(find $PKG/etc -type f)
 do
   mv $file $file.new
+  chmod -x $file.new # leaving execution permission is dangerous
+  echo config ${file#$PKG/}.new >> $PKG/install/doinst.sh
 done
 
-# Add *.new files into doinst.sh
-for file in $(find $PKG/etc -type f -name "*.new")
-do
-  echo config $(echo $file | sed "s:$PKG/::") >> $PKG/install/doinst.sh
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO docs/grub.cfg \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
 
diff --git a/system/grub2/slack-desc b/system/grub2/slack-desc
index 5547a58ad5699..ed61e9fd38b40 100644
--- a/system/grub2/slack-desc
+++ b/system/grub2/slack-desc
@@ -9,11 +9,11 @@
 grub2: GRUB (the GRand Unified Bootloader)
 grub2:
 grub2: GNU GRUB is a multiboot boot loader.
-grub2: 
+grub2:
 grub2: os-prober is needed to detect OSes on other partitions.
-grub2: 
-grub2: unifont is required when you want to use a background image on the
-grub2: grub screen.(gfxterm(graphical terminal) uses unifont)
+grub2:
+grub2: unifont is required since graphical terminal uses unifont.
+grub2: Graphical terminal displays background images on grub.
 grub2:
 grub2: The website of grub is http://www.gnu.org/software/grub/
 grub2: