diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-03-26 21:41:11 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-03-26 22:32:07 +0100 |
| commit | 16073efc491213f52855ca9c355652de6ea47947 (patch) | |
| tree | 53ea8f982ab042f49774200260af03c6731c0edf /eclass | |
| parent | font.eclass: use BDEPEND with EAPI 7 (diff) | |
| download | gentoo-16073efc491213f52855ca9c355652de6ea47947.tar.gz gentoo-16073efc491213f52855ca9c355652de6ea47947.tar.bz2 gentoo-16073efc491213f52855ca9c355652de6ea47947.zip | |
font.eclass: Cleanup double slashes, FONTDIR always starts w/ '/'
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/font.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/font.eclass b/eclass/font.eclass index 45c620419950..ec1b6ca93587 100644 --- a/eclass/font.eclass +++ b/eclass/font.eclass @@ -61,14 +61,14 @@ font_xfont_config() { local dir_name if in_iuse X && use X ; then dir_name="${1:-${FONT_PN}}" - rm -f "${ED}/${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} \ + rm -f "${ED}${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} \ || die "failed to prepare ${FONTDIR}/${1//${S}/}" einfo "Creating fonts.scale & fonts.dir in ${dir_name##*/}" - mkfontscale "${ED}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.scale" + mkfontscale "${ED}${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.scale" mkfontdir \ -e "${EPREFIX}"/usr/share/fonts/encodings \ -e "${EPREFIX}"/usr/share/fonts/encodings/large \ - "${ED}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.dir" + "${ED}${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.dir" [[ -e fonts.alias ]] && doins fonts.alias fi } @@ -139,8 +139,8 @@ font_cleanup_dirs() { font_pkg_setup() { # make sure we get no collisions # setup is not the nicest place, but preinst doesn't cut it - if [[ -e "${EROOT}/${FONTDIR}/fonts.cache-1" ]] ; then - rm "${EROOT}/${FONTDIR}/fonts.cache-1" || die "failed to remove fonts.cache-1" + if [[ -e "${EROOT}${FONTDIR}/fonts.cache-1" ]] ; then + rm "${EROOT}${FONTDIR}/fonts.cache-1" || die "failed to remove fonts.cache-1" fi } |