[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Mike Frysinger]

commit:     8fe39c8d9fd69b55db808f93edb8c1cbee496f36
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 23:46:48 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 23:54:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe39c8d

sysa-apps/memtest86+: rework grub shell style

Drop old portable shell style as we don't care about such insane shells.

 sys-apps/memtest86+/files/39_memtest86+ | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sys-apps/memtest86+/files/39_memtest86+ 
b/sys-apps/memtest86+/files/39_memtest86+
index 10e1964cb8d..9c9067a5e73 100644
--- a/sys-apps/memtest86+/files/39_memtest86+
+++ b/sys-apps/memtest86+/files/39_memtest86+
@@ -11,16 +11,14 @@ if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then
 fi
 
 submenu_indentation=""
-if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; 
then
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
        submenu_indentation="${grub_tab}"
        cat <<EOF
 submenu 'Memtest86+' {
 EOF
 fi
 
-
 if [ -f "${memtest}" ]; then
-
        gettext_printf "Found memtest image: %s\n" "${memtest}" >&2
 
        device="$("${grub_probe}" --target=device "${memtest}")"
@@ -29,7 +27,7 @@ if [ -f "${memtest}" ]; then
 ${submenu_indentation}menuentry 'Memtest86+' {
 EOF
 
-       if [ "x${submenu_indentation}" != "x" ]; then
+       if [ -n "{submenu_indentation}" ]; then
                prepare_grub_to_access_device "${device}" | grub_add_tab | 
grub_add_tab
        else
                prepare_grub_to_access_device "${device}" | grub_add_tab
@@ -42,7 +40,6 @@ EOF
 fi
 
 if [ -f "${memtestbsd}" ]; then
-
        gettext_printf "Found memtest image: %s\n" "${memtestbsd}" >&2
 
        device="$("${grub_probe}" --target=device "${memtestbsd}")"
@@ -51,7 +48,7 @@ if [ -f "${memtestbsd}" ]; then
 ${submenu_indentation}menuentry 'Memtest86+ (netbsd)' {
 EOF
 
-       if [ "x${submenu_indentation}" != "x" ]; then
+       if [ -n "${submenu_indentation}" ]; then
                prepare_grub_to_access_device "${device}" | grub_add_tab | 
grub_add_tab
        else
                prepare_grub_to_access_device "${device}" | grub_add_tab
@@ -63,7 +60,7 @@ ${submenu_indentation}}
 EOF
 fi
 
-if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; 
then
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
        cat <<EOF
 }
 EOF