From 4459819a52432070d8cd94acbdb72093fbd8e8c2 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 3 Feb 2012 21:30:05 +0100 Subject: [PATCH] * util/grub-reboot.in: Add missing datarootdir. Add missing newline. * util/grub-set-default.in: Add missing datarootdir. * util/powerpc/ieee1275/grub-mkrescue.in: Add missing newline. * util/grub-mkrescue.in: Likewise. --- ChangeLog | 8 ++++++++ util/grub-mkrescue.in | 2 +- util/grub-reboot.in | 3 ++- util/grub-set-default.in | 1 + util/powerpc/ieee1275/grub-mkrescue.in | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d805f09e..8407efe0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-02-03 Vladimir Serbinenko + + * util/grub-reboot.in: Add missing datarootdir. + Add missing newline. + * util/grub-set-default.in: Add missing datarootdir. + * util/powerpc/ieee1275/grub-mkrescue.in: Add missing newline. + * util/grub-mkrescue.in: Likewise. + 2012-02-03 Vladimir Serbinenko * util/grub.d/30_os-prober.in: Fix TRANSLATORS comment. diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in index bb55bc15a..e86e6c39f 100644 --- a/util/grub-mkrescue.in +++ b/util/grub-mkrescue.in @@ -62,7 +62,7 @@ usage () { printf " --xorriso=%-14s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as xorriso [optional]")" printf " --grub-mkimage=%-9s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")" echo - gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s" "xorriso -as mkisofs -help" "$self" + gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s\n" "xorriso -as mkisofs -help" "$self" echo gettext "Option -- switches to native xorriso command mode."; echo echo diff --git a/util/grub-reboot.in b/util/grub-reboot.in index b003de10a..400f497a1 100644 --- a/util/grub-reboot.in +++ b/util/grub-reboot.in @@ -24,6 +24,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ +datarootdir="@datarootdir@" datadir="@datadir@" self=`basename $0` @@ -38,7 +39,7 @@ grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` # Usage: usage # Print the usage. usage () { - gettext_printf "Usage: %s [OPTION] entry" "$self" + gettext_printf "Usage: %s [OPTION] entry\n" "$self" gettext "Set the default boot entry for GRUB, for the next boot only."; echo echo printf " -h, --help %s\n" "$(gettext "print this message and exit")" diff --git a/util/grub-set-default.in b/util/grub-set-default.in index 100ae9921..001002773 100644 --- a/util/grub-set-default.in +++ b/util/grub-set-default.in @@ -24,6 +24,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ +datarootdir="@datarootdir@" datadir="@datadir@" self=`basename $0` diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in index 9b0075ca6..992bd757d 100644 --- a/util/powerpc/ieee1275/grub-mkrescue.in +++ b/util/powerpc/ieee1275/grub-mkrescue.in @@ -46,7 +46,7 @@ usage () { printf " --modules=%-14s%s\n" "$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")" printf " --grub-mkimage=%-9s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")" echo - gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s" "genisoimage -help" "$self" + gettext_printf "%s generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by: %s\n" "genisoimage -help" "$self" echo gettext "Report bugs to ."; echo }