From: Robin H. Johnson Date: Mon, 25 Feb 2008 02:08:22 +0000 (+0000) Subject: Fix up all quoting to make repoman happy. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d1929ab6b7a087a76a06e64142ef5429792da2fa;p=gentoo.git Fix up all quoting to make repoman happy. Package-Manager: portage-2.1.4.4 --- diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 9a1306aa5839..bc1d753a2202 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.75 2008/02/16 22:05:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.76 2008/02/25 02:08:22 robbat2 Exp $ + + 25 Feb 2008; Robin H. Johnson grub-0.92-r1.ebuild, + grub-0.94-r1.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild, + grub-0.96-r3.ebuild, grub-0.97.ebuild, grub-0.97-r2.ebuild, + grub-0.97-r3.ebuild, grub-0.97-r4.ebuild: + Fix up all quoting to make repoman happy. *grub-1.96 (16 Feb 2008) diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index d622fe1142d5..9a27d9b403eb 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -15,16 +15,16 @@ DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA DIST grub-1.95.tar.gz 519269 RMD160 bce7d8790b47f3ce7fa4ce7ac61242cc242ad5da SHA1 6691f7c2f64a1de03f3bc2304fa2c83e92050cc3 SHA256 d40c88f1da2919c252500c4cae0de6e9e1a368695117a7a23c4e07d2b4b9b769 DIST grub-1.96.tar.gz 639970 RMD160 80c8a41b73063706310f3f6e99acb912e2e8f9ab SHA1 6af22f354d8c551dd82e71f15196e2f96a1318ba SHA256 0cdfb104da5492b1b2b402ed45873b3b7a7407f5017ae7d8806327a619dc1d59 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf -EBUILD grub-0.92-r1.ebuild 2629 RMD160 77f325380d8856cfcba0d8e10f8a3cef05b35799 SHA1 03310bf3011971d1a65c7db46646ce596d0889ea SHA256 06ab8bdd075d7085fde0b41f8773fd4ec0f40fa2cc3c905060cafa73fdb92b56 -EBUILD grub-0.94-r1.ebuild 3528 RMD160 79ab120582d322a09dedfe18cada0dbb8f36c9f3 SHA1 981bf90e5515a1fa95524a54fcc083edc4c9ceec SHA256 d624f4dfd449b2d31ce6f9a11dfc983ea9eaa94b6d436806ca1473f4ba3d1ffc -EBUILD grub-0.96-r1.ebuild 4742 RMD160 3fc23978238715683ec0042eddf06e9861967405 SHA1 0b7e7c9a1eaff9544697f311a5c031124d226234 SHA256 a1fd431fd82077879bfe81f6f4fa4592bb77977ee51b2ba1a3752c9e91ef044c -EBUILD grub-0.96-r2.ebuild 4343 RMD160 25a2d4263261501e48e6bbedb7fb4761f710778e SHA1 f326fa4e29af49e1a92e0e0604bfa2bf5fadd172 SHA256 3be87c06ae7f39ea3ac8c00befab972f5c1b56da31d9db7d1aede49a8ae1f246 -EBUILD grub-0.96-r3.ebuild 4577 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb SHA1 04c61e8f7e638c3ecf8753ea02bd997f759726b9 SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c -EBUILD grub-0.97-r2.ebuild 4837 RMD160 857c138748179eac8113fb04166b07d409ed5eca SHA1 41effb9a073d97587d1ffc5cc4ad3c8fcf9b6fab SHA256 433ac8c39e9c9d31e8f470a487d473d4a308520918bdd7763f9ca5b836be6bc0 -EBUILD grub-0.97-r3.ebuild 4702 RMD160 fed2384bb28b76dcf40721c5b2a1f28abc6af28d SHA1 4e14a9413c04827e4432c616d719bbbc88c7d993 SHA256 a005e82201ec3dc4c77b238186acfe0602e529f2d3d48caa0fb08f323e0f5d1a -EBUILD grub-0.97-r4.ebuild 4747 RMD160 40929821153f0e98280d18f5b4ef691471b233d7 SHA1 b5b86f5c4062c69277ca9f085183eb03de981961 SHA256 1094289cc43c6f89d139d95dc5f71ef2a736e5968e8655a829a1fe429f53cfbe -EBUILD grub-0.97.ebuild 4518 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 SHA1 07484f2e49a04c267a8f3dec6118b4a2833dbdcd SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6 +EBUILD grub-0.92-r1.ebuild 2639 RMD160 cacac6d3ed808c52a05fc6b1c0c929af7f114926 SHA1 5828e84ded260a50bd7c6cd30217e1d0cf881299 SHA256 40c896a0ec005d50e9c6effd4d2ee95c1e0712d26a13f8f55bc6d7380c6d7102 +EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a SHA1 a2131f5f673ad9f5dbf6288d7484eb844de52e37 SHA256 864ca6f410a0a6caf18d4bdc4a0389bb922802459e0c2a975c0442f6bd4a4fd5 +EBUILD grub-0.96-r1.ebuild 4747 RMD160 1fbaf2c1e712baf3cd7124b6e9ba58ba63ce631a SHA1 3e877e57f4a7618c7a3ebe374fa9f5ae39aae3f4 SHA256 a000bb83287a7d46a5637b60e477d8fedbf8c2b465074edf1ba3b21bca95a374 +EBUILD grub-0.96-r2.ebuild 4349 RMD160 8b59e7b7bcf02f6e6698bf785950988c71907e26 SHA1 5f068f5fcfd05a7769814d6fae868f77dea2ccf9 SHA256 cbaae5c519231d853e28e9a2799b08544e8b2a97c93d1905a21244d385b0e20c +EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b SHA1 2d7dd82a379afd847be5b129a090bb1e954ffd71 SHA256 2278f36b971d091471f39acd68902edf5e54fc88bc2d417e033fbf8128159e13 +EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429 +EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9 +EBUILD grub-0.97-r4.ebuild 4767 RMD160 eb9be2cfac0a15d9a4345421dbe3143fd80ddc20 SHA1 f9ab7ac7c9d48b3d59987321d6aa0c00c57ae8bb SHA256 ce68870a0cc35724ef56973acf126283d2f1bd629db1d8dc9cfca7abca951457 +EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a EBUILD grub-1.95.ebuild 1031 RMD160 1c23cad81706afa0c26f307728afd0241d4fed4e SHA1 ae977cab016f00866c6e689a9178fe7f58512302 SHA256 42be6335ab4b98d3b35db28f0e984730c7f026c2d54db13f838d4c55db6658f8 EBUILD grub-1.96.ebuild 951 RMD160 e63c22f701ba3761265472679f081df6dc1ceebc SHA1 e39f533503448573a69ea65b2901c43e122434cf SHA256 c872f1879e32130517ef4a9ab5d920a1cb9980a56eec8dbbfeb13eff10579d9a -MISC ChangeLog 18819 RMD160 3e2b52051d19493a52d13a2e5dd9856bc87fd948 SHA1 91208d9ea731a90e14bfe8840f31ca5c3bb4d51b SHA256 6545c58fb6723f8bb47ca6ea7a08c03cdc9d8cc43a507f55250697699b57117d +MISC ChangeLog 19110 RMD160 123b745962dd619a85667856d615db6229869d3a SHA1 e30bebaa492f50003dfed9ec9054758a8536301d SHA256 d501d52de3bd4b269ab67452893690ef981535476045673b5152522c67551732 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-boot/grub/grub-0.92-r1.ebuild b/sys-boot/grub/grub-0.92-r1.ebuild index fbfd1d6968c1..f5d5efad28a2 100644 --- a/sys-boot/grub/grub-0.92-r1.ebuild +++ b/sys-boot/grub/grub-0.92-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v 1.13 2005/07/28 17:53:38 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v 1.14 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -21,18 +21,18 @@ IUSE="" DEPEND=">=sys-libs/ncurses-5.2-r5" PROVIDE="virtual/bootloader" -PATCHDIR=${WORKDIR}/gentoo +PATCHDIR="${WORKDIR}/gentoo" src_unpack() { - unpack ${A} ; cd ${S} + unpack ${A} ; cd "${S}" EPATCH_SUFFIX="patch" - epatch ${PATCHDIR} + epatch "${PATCHDIR}" if [ "`gcc-version`" = "3.3" ] then - epatch ${PATCHDIR}/gcc-3.3 + epatch "${PATCHDIR}"/gcc-3.3 fi } @@ -61,15 +61,15 @@ src_compile() { src_install() { make \ - prefix=${D}/usr \ - sbindir=${D}/sbin \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ + prefix="${D}"/usr \ + sbindir="${D}"/sbin \ + mandir="${D}"/usr/share/man \ + infodir="${D}"/usr/share/info \ install || die "Installation failed." insinto /boot/grub - doins ${DISTDIR}/splash.xpm.gz - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO + doins "${DISTDIR}"/splash.xpm.gz + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO } pkg_postinst() { diff --git a/sys-boot/grub/grub-0.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild index 01e71b23bcad..4e8821b37d5f 100644 --- a/sys-boot/grub/grub-0.94-r1.ebuild +++ b/sys-boot/grub/grub-0.94-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.24 2005/08/21 02:24:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.25 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -36,11 +36,11 @@ pkg_setup() { } src_unpack() { - unpack ${A}; cd ${S} + unpack ${A}; cd "${S}" EPATCH_SUFFIX="patch" - epatch ${PATCHDIR} + epatch "${PATCHDIR}" } src_compile() { @@ -75,7 +75,7 @@ src_compile() { emake w89c840_o_CFLAGS="-O" || die "making netboot stuff" - mv stage2/{nbgrub,pxegrub} ${S} + mv stage2/{nbgrub,pxegrub} "${S}" mv stage2/stage2 stage2/stage2.netboot make clean || die @@ -91,19 +91,19 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die exeinto /usr/lib/grub/${CHOST} doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot insinto /boot/grub - doins ${DISTDIR}/splash.xpm.gz + doins "${DISTDIR}"/splash.xpm.gz newins docs/menu.lst grub.conf.sample - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO newdoc docs/menu.lst grub.conf.sample docinto gentoo - dodoc ${PATCHDIR}/README* + dodoc "${PATCHDIR}"/README* } pkg_postinst() { diff --git a/sys-boot/grub/grub-0.96-r1.ebuild b/sys-boot/grub/grub-0.96-r1.ebuild index 2d483090d9e3..583f0e6ca42c 100644 --- a/sys-boot/grub/grub-0.96-r1.ebuild +++ b/sys-boot/grub/grub-0.96-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.15 2005/08/21 02:24:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.16 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -46,7 +46,7 @@ src_unpack() { unpack ${A} ; cd "${S}" EPATCH_SUFFIX="patch" - epatch ${PATCHDIR} + epatch "${PATCHDIR}" # a bunch of patches apply to raw autotool files autoconf || die "autoconf failed" @@ -117,18 +117,18 @@ src_install() { use netboot && doexe nbgrub pxegrub stage2/stage2.netboot insinto /boot/grub - doins ${DISTDIR}/splash.xpm.gz + doins "${DISTDIR}"/splash.xpm.gz newins docs/menu.lst grub.conf.sample - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO newdoc docs/menu.lst grub.conf.sample docinto gentoo - dodoc ${PATCHDIR}/README.Gentoo.patches + dodoc "${PATCHDIR}"/README.Gentoo.patches } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 # change menu.lst to grub.conf if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then @@ -144,7 +144,7 @@ pkg_postinst() { einfo "Copying files from /lib/grub and /usr/lib/grub to /boot" for x in /lib/grub/*/* /usr/lib/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} /boot/grub + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub done # hardened voodoo diff --git a/sys-boot/grub/grub-0.96-r2.ebuild b/sys-boot/grub/grub-0.96-r2.ebuild index f5856e36e4ab..ef7a58c82b75 100644 --- a/sys-boot/grub/grub-0.96-r2.ebuild +++ b/sys-boot/grub/grub-0.96-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.10 2006/02/05 14:44:52 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.11 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -38,7 +38,7 @@ src_unpack() { unpack ${A} ; cd "${S}" EPATCH_SUFFIX="patch" - epatch ${PATCHDIR} + epatch "${PATCHDIR}" # a bunch of patches apply to raw autotool files autoconf || die "autoconf failed" @@ -109,18 +109,18 @@ src_install() { use netboot && doexe nbgrub pxegrub stage2/stage2.netboot insinto /boot/grub - doins ${DISTDIR}/splash.xpm.gz + doins "${DISTDIR}"/splash.xpm.gz newins docs/menu.lst grub.conf.sample - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO newdoc docs/menu.lst grub.conf.sample docinto gentoo - dodoc ${PATCHDIR}/README* + dodoc "${PATCHDIR}"/README* } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 # change menu.lst to grub.conf if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then @@ -136,7 +136,7 @@ pkg_postinst() { einfo "Copying files from /lib/grub and /usr/lib/grub to /boot" for x in /lib/grub/*/* /usr/lib/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} /boot/grub + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub done [[ -e /boot/grub/grub.conf ]] \ diff --git a/sys-boot/grub/grub-0.96-r3.ebuild b/sys-boot/grub/grub-0.96-r3.ebuild index 28145f4d89da..219535b7710c 100644 --- a/sys-boot/grub/grub-0.96-r3.ebuild +++ b/sys-boot/grub/grub-0.96-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.3 2005/08/21 02:24:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.4 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -116,18 +116,18 @@ src_install() { use netboot && doexe nbgrub pxegrub stage2/stage2.netboot insinto /boot/grub - doins ${DISTDIR}/splash.xpm.gz + doins "${DISTDIR}"/splash.xpm.gz newins docs/menu.lst grub.conf.sample - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO newdoc docs/menu.lst grub.conf.sample docinto gentoo - dodoc ${PATCHDIR}/README* + dodoc "${PATCHDIR}"/README* } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 # change menu.lst to grub.conf if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then @@ -143,7 +143,7 @@ pkg_postinst() { einfo "Copying files from /lib/grub and /usr/lib/grub to /boot" for x in /lib/grub/*/* /usr/lib/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} /boot/grub + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub done [[ -e /boot/grub/grub.conf ]] \ diff --git a/sys-boot/grub/grub-0.97-r2.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild index 5dd50bbd89e1..5350f7b8a7cb 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 +# Copyright 1999-2008 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.10 2006/11/27 00:35:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.11 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -123,11 +123,11 @@ 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 + 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" @@ -143,7 +143,7 @@ setup_boot_dir() { einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}"" for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/ + [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/ done if [[ -e "${dir}"/grub/grub.conf ]] ; then @@ -155,7 +155,7 @@ setup_boot_dir() { } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 setup_boot_dir /boot einfo "To install grub files to another device (like a usb stick), just run:" einfo " emerge --config =${PF}" @@ -165,5 +165,5 @@ pkg_config() { local dir einfo "Enter the directory where you want to setup grub:" read dir - setup_boot_dir ${dir} + setup_boot_dir "${dir}" } diff --git a/sys-boot/grub/grub-0.97-r3.ebuild b/sys-boot/grub/grub-0.97-r3.ebuild index 328dafd280e0..c9871889c857 100644 --- a/sys-boot/grub/grub-0.97-r3.ebuild +++ b/sys-boot/grub/grub-0.97-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.10 2007/05/25 05:05:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.11 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -113,30 +113,30 @@ 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 + 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 fi - if [[ ! -e ${dir}/grub/menu.lst ]]; then + if [[ ! -e "${dir}"/grub/menu.lst ]]; then einfo "Linking from new grub.conf name to menu.lst" ln -snf grub.conf "${dir}"/grub/menu.lst fi - [[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} + [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} - einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}"" + einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}" for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/ + [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/ done - if [[ -e ${dir}/grub/grub.conf ]] ; then + if [[ -e "${dir}"/grub/grub.conf ]] ; then egrep \ -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ "${dir}"/grub/grub.conf | \ @@ -147,7 +147,7 @@ setup_boot_dir() { } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 [[ -n ${DONT_MOUNT_BOOT} ]] && return 0 setup_boot_dir /boot einfo "To install grub files to another device (like a usb stick), just run:" @@ -158,5 +158,5 @@ pkg_config() { local dir einfo "Enter the directory where you want to setup grub:" read dir - setup_boot_dir ${dir} + setup_boot_dir "${dir}" } diff --git a/sys-boot/grub/grub-0.97-r4.ebuild b/sys-boot/grub/grub-0.97-r4.ebuild index bdde1c97af30..948ab84554c9 100644 --- a/sys-boot/grub/grub-0.97-r4.ebuild +++ b/sys-boot/grub/grub-0.97-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild,v 1.1 2008/02/25 01:44:37 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild,v 1.2 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -115,30 +115,30 @@ 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 + 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 fi - if [[ ! -e ${dir}/grub/menu.lst ]]; then + if [[ ! -e "${dir}"/grub/menu.lst ]]; then einfo "Linking from new grub.conf name to menu.lst" ln -snf grub.conf "${dir}"/grub/menu.lst fi - [[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} + [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} - einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}"" + einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}" for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/ + [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/ done - if [[ -e ${dir}/grub/grub.conf ]] ; then + if [[ -e "${dir}"/grub/grub.conf ]] ; then egrep \ -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ "${dir}"/grub/grub.conf | \ @@ -149,7 +149,7 @@ setup_boot_dir() { } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 [[ -n ${DONT_MOUNT_BOOT} ]] && return 0 setup_boot_dir /boot einfo "To install grub files to another device (like a usb stick), just run:" @@ -160,5 +160,5 @@ pkg_config() { local dir einfo "Enter the directory where you want to setup grub:" read dir - setup_boot_dir ${dir} + setup_boot_dir "${dir}" } diff --git a/sys-boot/grub/grub-0.97.ebuild b/sys-boot/grub/grub-0.97.ebuild index 2ca8af3edd43..14ecf1f5830c 100644 --- a/sys-boot/grub/grub-0.97.ebuild +++ b/sys-boot/grub/grub-0.97.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.2 2005/08/21 02:24:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.3 2008/02/25 02:08:22 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -125,11 +125,11 @@ src_install() { newdoc docs/menu.lst grub.conf.sample docinto gentoo - dodoc ${PATCHDIR}/README* + dodoc "${PATCHDIR}"/README* } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 # change menu.lst to grub.conf if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then @@ -145,7 +145,7 @@ pkg_postinst() { einfo "Copying files from /lib/grub and /usr/lib/grub to /boot" for x in /lib/grub/*/* /usr/lib/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} /boot/grub + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub done [[ -e /boot/grub/grub.conf ]] \