diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-27 00:35:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-27 00:35:21 +0000 |
| commit | 1ecb9acbf66aa69e1e0c8c90ade4e196a8560f75 (patch) | |
| tree | 02c67b6a311161a6bba0c706fd11ad9ebd22fe82 | |
| parent | use "latest" with autotools (diff) | |
| download | gentoo-2-1ecb9acbf66aa69e1e0c8c90ade4e196a8560f75.tar.gz gentoo-2-1ecb9acbf66aa69e1e0c8c90ade4e196a8560f75.tar.bz2 gentoo-2-1ecb9acbf66aa69e1e0c8c90ade4e196a8560f75.zip | |
backport quoting fix #156214
(Portage version: 2.1.2_rc2-r2)
| -rw-r--r-- | sys-boot/grub/grub-0.97-r2.ebuild | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys-boot/grub/grub-0.97-r2.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild index 16812e7fff20..5dd50bbd89e1 100644 --- a/sys-boot/grub/grub-0.97-r2.ebuild +++ b/sys-boot/grub/grub-0.97-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.9 2006/09/21 14:28:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.10 2006/11/27 00:35:21 vapier Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -123,13 +123,12 @@ src_install() { setup_boot_dir() { local dir="${1}" - [[ ! -e "${dir}" ]] && die "${dir} does not exist!" - - [[ ! -e "${dir}/grub" ]] && mkdir "${dir}/grub" + [[ ! -e ${dir} ]] && die "${dir} does not exist!" + [[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub" # change menu.lst to grub.conf - if [[ ! -e "${dir}/grub/grub.conf" && -e "${dir}/grub/menu.lst" ]] ; then - mv -f "${dir}/grub/menu.lst ${dir}/grub/grub.conf" + if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then + mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf ewarn ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" ewarn |