From fc8012008fae8da38e357876456de40b92cad885 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Fri, 20 Oct 2017 21:57:44 +0200
Subject: Fix man pages, add figlet (and not toilet)

---
 make-boot-image.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/make-boot-image.sh b/make-boot-image.sh
index a5712a3..335da4f 100755
--- a/make-boot-image.sh
+++ b/make-boot-image.sh
@@ -90,7 +90,8 @@ then	$ROOTCMD apt-get update
 	[ "x$DEVEL_MODE" = "xy" ] && $ROOTCMD apt-get install qemu-system-x86
 	# Dependencies to put into the initrd
 	$ROOTCMD apt-get install dmidecode pciutils usbutils lshw sysstat iftop strace tmux \
-		ntfs-3g e2fsprogs partclone util-linux udpcast gdisk efibootmgr tcpdump pigz pv
+		ntfs-3g e2fsprogs partclone util-linux udpcast gdisk efibootmgr tcpdump pigz \
+		pv figlet toilet-fonts
 	# util-linux : fdisk, sfdisk, lsblk, setterm
 	> "$WORKDIR/apt-done"
 fi
@@ -262,7 +263,7 @@ then	(
 		# Diagnostic tools
 		mkchroot "$WORKDIR/initrd" dmidecode iftop iostat lshw lspci lsblk lsusb mpstat tcpdump
 		# Console tools and manpages display
-		mkchroot "$WORKDIR/initrd" setterm strace groff nroff troff grotty gtbl tmux pv
+		mkchroot "$WORKDIR/initrd" setterm strace groff nroff troff grotty gtbl tmux pv figlet
 		# Filesystem tools
 		mkchroot "$WORKDIR/initrd" mkfs mke2fs /sbin/mkfs.ext* mkntfs mkfs.ntfs mkfs.fat mkexfatfs mkfs.exfat mkfs
 		mkchroot "$WORKDIR/initrd" ntfs-3g mount.ntfs mount.fuse mount.exfat-fuse mount.exfat
@@ -288,14 +289,19 @@ then	(
 fi
 
 if [ ! -d "$WORKDIR/initrd/usr/man" ]
-then	mkdir -p "$WORKDIR"/initrd/usr/man/man{1,8} "$WORKDIR"/initrd/usr/share/groff/current/font "$WORKDIR/initrd/etc/groff/"
-	cp -a /usr/share/man/man1/{iostat,lshw,mpstat,setterm,pv,strace,tmux,pigz,udp-receiver}* "$WORKDIR/initrd/usr/man/man1/"
-	cp -a /usr/share/man/man8/{dmidecode,iftop,lspci,lsblk,lsusb,partclone,efibootmgr,mkfs,\
-		ntfs,mkntfs,mkexfatfs,mount.ntfs,mount.fuse,mount.exfat-fuse,mount.exfat,fdisk,gdisk,sfdisk,\
-		sgdisk,tcpdump}* "$WORKDIR/initrd/usr/man/man8/"
-	cp -ra /usr/share/groff/current/font/devascii "$WORKDIR/initrd/usr/share/groff/current/font/"
-	cp -ra /usr/share/groff/current/tmac "$WORKDIR/initrd/usr/share/groff/current/"
-	cp -a /etc/groff/man.local "$WORKDIR/initrd/usr/share/groff/current/"
+then	mkdir -p "$WORKDIR"/initrd/usr/man/man{1,6,8} "$WORKDIR"/initrd/usr/share/groff/current/font
+	mkdir -p "$WORKDIR"/initrd/etc/groff/ "$WORKDIR"/initrd/usr/share/figlet/
+
+	cp -a /usr/share/man/man1/{iostat,lshw,mpstat,setterm,pv,strace,tmux,pigz,udp-receiver}* "$WORKDIR"/initrd/usr/man/man1/
+	cp -a /usr/share/man/man6/figlet* "$WORKDIR"/initrd/usr/man/man6/
+	cp -a /usr/share/man/man8/{dmidecode,iftop,lspci,lsblk,lsusb,partclone,efibootmgr,mkfs}* "$WORKDIR"/initrd/usr/man/man8/
+	cp -a /usr/share/man/man8/{ntfs,mkntfs,mkexfatfs,mount.ntfs,mount.fuse,mount.exfat-fuse}* "$WORKDIR"/initrd/usr/man/man8/
+	cp -a /usr/share/man/man8/{mount.exfat,fdisk,gdisk,sfdisk,sgdisk,tcpdump}* "$WORKDIR"/initrd/usr/man/man8/
+
+	cp -ra /usr/share/groff/current/font/devascii "$WORKDIR"/initrd/usr/share/groff/current/font/
+	cp -ra /usr/share/groff/current/tmac "$WORKDIR"/initrd/usr/share/groff/current/
+	cp -a /usr/share/figlet/{standard,mono12}* "$WORKDIR"/initrd/usr/share/figlet/
+	cp -a /etc/groff/man.local "$WORKDIR"/initrd/usr/share/groff/current/
 fi
 
 p="$WORKDIR/kernel/tools/perf/perf"
@@ -543,13 +549,12 @@ tmux new-session -d "if $* ; then tmux kill-server; else tmux select-pane -P bg=
  select-pane -t:.0  \; \
  attach
 EOF
-#XXX Unused ?
-add_initrd_script "/bin/toilet-center" <<"EOF"
+add_initrd_script "/bin/figlet-center" <<"EOF"
 # Output some center ASCII-art text, one line per argument
 printf '\033]2;'"$*"'\033\\' # Term title (tmux)
 while [ -n "$1" ]
 do
-	echo $1 | toilet -t -f mono12 | awk "{ for (i=0;i<($(tput cols)-length(\$0))/2;i++) printf \" \"; print }"
+	echo $1 | figlet -t -f mono12 | awk "{ for (i=0;i<($(tput cols)-length(\$0))/2;i++) printf \" \"; print }"
 	shift
 done
 EOF
-- 
cgit v1.2.3