diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2017-03-14 16:46:48 -0700 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2017-03-14 16:54:27 -0700 |
| commit | 8fe39c8d9fd69b55db808f93edb8c1cbee496f36 (patch) | |
| tree | 0519c93bf18b53db487c0c15fda494f68b03646a /sys-apps/memtest86+ | |
| parent | app-admin/entr: version bump. (diff) | |
| download | gentoo-8fe39c8d9fd69b55db808f93edb8c1cbee496f36.tar.gz gentoo-8fe39c8d9fd69b55db808f93edb8c1cbee496f36.tar.bz2 gentoo-8fe39c8d9fd69b55db808f93edb8c1cbee496f36.zip | |
sysa-apps/memtest86+: rework grub shell style
Drop old portable shell style as we don't care about such insane shells.
Diffstat (limited to 'sys-apps/memtest86+')
| -rw-r--r-- | sys-apps/memtest86+/files/39_memtest86+ | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys-apps/memtest86+/files/39_memtest86+ b/sys-apps/memtest86+/files/39_memtest86+ index 10e1964cb8df..9c9067a5e736 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 |