summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-27 00:35:21 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-27 00:35:21 +0000
commit29cce44d2d49034c579feb9f9ca25d8a99b1e8a0 (patch)
treebb78a5b0b22ed8b09d56fab1c828684e30cf3934 /sys-boot/grub/grub-0.97-r2.ebuild
parentuse "latest" with autotools (diff)
downloadhistorical-29cce44d2d49034c579feb9f9ca25d8a99b1e8a0.tar.gz
historical-29cce44d2d49034c579feb9f9ca25d8a99b1e8a0.tar.bz2
historical-29cce44d2d49034c579feb9f9ca25d8a99b1e8a0.zip
backport quoting fix #156214
Package-Manager: portage-2.1.2_rc2-r2
Diffstat (limited to 'sys-boot/grub/grub-0.97-r2.ebuild')
-rw-r--r--sys-boot/grub/grub-0.97-r2.ebuild11
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