* util/grub-install.in: Remove unnecessary brackets from tr

arguments.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
Reported by: Jamie Heilman.  Fixes Debian bug #612564.

diff --git a/ChangeLog b/ChangeLog
index d3325ac6b2dc01524bd714041adee2c46a54a595..6517450ce4a48edb6ffe66d485b3df8e66e4ac23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-09  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-install.in: Remove unnecessary brackets from tr
+       arguments.
+       * util/grub.d/10_hurd.in: Likewise.
+       * util/grub.d/10_kfreebsd.in: Likewise.
+       * util/grub.d/10_linux.in: Likewise.
+       * util/grub.d/20_linux_xen.in: Likewise.
+       Reported by: Jamie Heilman.  Fixes Debian bug #612564.
+
 2011-02-08  Colin Watson  <cjwatson@ubuntu.com>
 
        * include/grub/file.h (not_easly_seekable): Rename to ...

diff --git a/util/grub-install.in b/util/grub-install.in
index 1ae00b2fdb58ec108789ccf8e5fd5b15855adbe4..af3034e0381457137f72f2b72c62b969825c4254 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -64,7 +64,7 @@ if test -f "${sysconfdir}/default/grub" ; then
     . "${sysconfdir}/default/grub"
 fi
 
-bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr '[A-Z]' '[a-z]' | cut -d' ' -f1)"
+bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr 'A-Z' 'a-z' | cut -d' ' -f1)"
 if test -z "$bootloader_id"; then
     bootloader_id=grub
 fi

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index eeb441aa4cceaf7f02938e7e1c171805553ee203..8c54eab97b2e650dfb412f49fd465d1f975118b6 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -28,7 +28,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi
 
 at_least_one=false

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index b026812a7f01fa3c43dc4acdcbf6a83dde5d3f20..dce5e945cf41c3de8e79f0724bb3d8dc20265141 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -31,7 +31,7 @@ CLASS="--class os"
 case "${GRUB_DISTRIBUTOR}" in
   Debian)
        OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD"
-       CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) --class gnu-kfreebsd --class gnu ${CLASS}"
+       CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) --class gnu-kfreebsd --class gnu ${CLASS}"
   ;;
   *)
        OS="FreeBSD"

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index a09c3e687709ae60a571a3be783790cf0092c5e5..491d2b5ceed71075a4b0d98b74a02e6caca2ddcb 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -32,7 +32,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi
 
 # loop-AES arranges things so that /dev/loop/X can be our root device, but

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index ee49cd9038f10dcd4ae76230755d4dcc9f220159..356219e1d5d0fae87981a35e73a103f69364d827 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -32,7 +32,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi
 
 # loop-AES arranges things so that /dev/loop/X can be our root device, but