=== modified file 'ChangeLog'
--- ChangeLog 2010-06-03 08:48:23 +0000
+++ ChangeLog 2010-06-03 20:34:49 +0000
@@ -1,3 +1,22 @@
+2010-06-03 Grégoire Sutre
+
+ Make --version uniform and avoid hard-coded program name.
+
+ * util/grub-mkimage.c (main): Use `program_name' instead of
+ hard-coded string.
+ * util/i386/pc/grub-setup.c (main): Likewise.
+ * util/sparc64/ieee1275/grub-setup.c (parse_options): Likewise.
+ * util/grub-install.in: Save the basename of $0 in $self, and use the
+ latter in informational messages. Use the same format for --version
+ as the binary programs.
+ * util/grub-mkconfig.in: Likewise.
+ * util/grub-mkrescue.in: Likewise.
+ * util/grub-reboot.in: Likewise.
+ * util/grub-set-default.in: Likewise.
+ * util/i386/efi/grub-install.in: Likewise.
+ * util/ieee1275/grub-install.in: Likewise.
+ * util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
+
2010-06-03 Colin Watson
* INSTALL: Document several build requirements for optional features
=== modified file 'util/grub-install.in'
--- util/grub-install.in 2010-05-18 11:45:25 +0000
+++ util/grub-install.in 2010-06-03 20:34:49 +0000
@@ -34,6 +34,8 @@ address@hidden@/@PACKAGE_TARNAME@/ascii.p
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
address@hidden@/locale
+self=`basename $0`
+
grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
@@ -61,7 +63,7 @@ fi
# Print the usage.
usage () {
cat <.
@@ -108,7 +110,7 @@ for option in "$@"; do
usage
exit 0 ;;
-v | --version)
- echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+ echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
exit 0 ;;
--modules=*)
modules=`echo "$option" | sed 's/--modules=//'` ;;
=== modified file 'util/grub-mkconfig.in'
--- util/grub-mkconfig.in 2010-05-23 12:11:11 +0000
+++ util/grub-mkconfig.in 2010-06-03 20:34:49 +0000
@@ -23,7 +23,8 @@ address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
@@ -31,6 +32,8 @@ pkgdatadir=${datadir}/`echo @PACKAGE_TAR
grub_cfg=""
grub_mkconfig_dir=${sysconfdir}/grub.d
+self=`basename $0`
+
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
@@ -38,7 +41,7 @@ grub_probe=${sbindir}/`echo grub-probe |
# Print the usage.
usage () {
cat <&2
+ echo "$self: You must run this as root" >&2
exit 1
fi
fi
@@ -284,7 +287,7 @@ cat << EOF
#
# DO NOT EDIT THIS FILE
#
-# It is automatically generated by $0 using templates
+# It is automatically generated by $self using templates
# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
#
EOF
=== modified file 'util/grub-mkimage.c'
--- util/grub-mkimage.c 2010-05-18 11:55:26 +0000
+++ util/grub-mkimage.c 2010-06-03 20:34:49 +0000
@@ -1307,7 +1307,7 @@ main (int argc, char *argv[])
break;
case 'V':
- printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+ printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0;
case 'v':
=== modified file 'util/grub-mkrescue.in'
--- util/grub-mkrescue.in 2010-05-27 11:43:22 +0000
+++ util/grub-mkrescue.in 2010-06-03 20:34:49 +0000
@@ -30,6 +30,8 @@ address@hidden@
address@hidden@
pkglib_DATA="@pkglib_DATA@"
+self=`basename $0`
+
multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-multiboot
coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-coreboot
qemu_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-qemu
@@ -44,7 +46,7 @@ grub_mkimage=${bindir}/`echo grub-mkimag
# Print the usage.
usage () {
cat <.
EOF
@@ -67,7 +69,7 @@ for option in "$@"; do
usage
exit 0 ;;
-v | --version)
- echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
+ echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
exit 0 ;;
--modules=*)
modules=`echo "$option" | sed 's/--modules=//'` ;;
=== modified file 'util/grub-reboot.in'
--- util/grub-reboot.in 2010-01-05 11:16:42 +0000
+++ util/grub-reboot.in 2010-06-03 20:34:49 +0000
@@ -22,6 +22,10 @@ transform="@program_transform_name@"
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+self=`basename $0`
grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
rootdir=
@@ -30,7 +34,7 @@ rootdir=
# Print the usage.
usage () {
cat <.
@@ -78,7 +80,7 @@ for option in "$@"; do
usage
exit 0 ;;
-v | --version)
- echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+ echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
exit 0 ;;
--modules=*)
modules=`echo "$option" | sed 's/--modules=//'` ;;
@@ -219,7 +221,7 @@ $grub_mkimage -O ${target_cpu}-efi --out
echo "Installation finished. No error reported."
echo "This is the contents of the device map $device_map."
echo "Check if this is correct or not. If any of the lines is incorrect,"
-echo "fix it and re-run the script \`grub-install'."
+echo "fix it and re-run the script \`$self'."
echo
cat $device_map
=== modified file 'util/i386/pc/grub-setup.c'
--- util/i386/pc/grub-setup.c 2010-05-17 19:26:16 +0000
+++ util/i386/pc/grub-setup.c 2010-06-03 20:34:49 +0000
@@ -702,7 +702,7 @@ main (int argc, char *argv[])
break;
case 'V':
- printf ("grub-setup (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+ printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0;
case 'v':
=== modified file 'util/ieee1275/grub-install.in'
--- util/ieee1275/grub-install.in 2010-04-26 19:27:41 +0000
+++ util/ieee1275/grub-install.in 2010-06-03 20:34:49 +0000
@@ -34,6 +34,8 @@ address@hidden@
address@hidden@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+self=`basename $0`
+
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
@@ -53,7 +55,7 @@ nvsetenv=`which nvsetenv`
# Print the usage.
usage () {
cat <.
EOF
@@ -61,7 +63,7 @@ for option in "$@"; do
usage
exit 0 ;;
-v | --version)
- echo "grub-mkrescue (GNU GRUB ${PACKAGE_VERSION})"
+ echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
exit 0 ;;
--modules=*)
modules=`echo "$option" | sed 's/--modules=//'` ;;
=== modified file 'util/sparc64/ieee1275/grub-setup.c'
--- util/sparc64/ieee1275/grub-setup.c 2010-05-17 19:26:16 +0000
+++ util/sparc64/ieee1275/grub-setup.c 2010-06-03 20:34:49 +0000
@@ -503,7 +503,7 @@ parse_options (struct grub_setup_info *g
break;
case 'V':
- printf ("grub-setup (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+ printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0;
case 'v':