net-nds/openldap: fix UnnecessarySlashStrip
authorMikle Kolyada <zlogene@gentoo.org>
Wed, 12 Feb 2020 19:10:45 +0000 (22:10 +0300)
committerMikle Kolyada <zlogene@gentoo.org>
Wed, 12 Feb 2020 19:10:53 +0000 (22:10 +0300)
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
net-nds/openldap/openldap-2.4.49.ebuild

index 6b4c5ba2ad9396529589f80d68f99c18b3c16776..065d0375a0bfc618ee4ada929de2b6cd4fecd6d7 100644 (file)
@@ -738,19 +738,19 @@ multilib_src_install() {
                use prefix || fowners ldap:ldap /var/lib/openldap-data
                fperms 0700 /var/lib/openldap-data
 
-               echo "OLDPF='${PF}'" > "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-               echo "# do NOT delete this. it is used" >> "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-               echo "# to track versions for upgrading." >> "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+               echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+               echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+               echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
 
                # use our config
-               rm "${ED%/}"/etc/openldap/slapd.conf
+               rm "${ED}"/etc/openldap/slapd.conf
                insinto /etc/openldap
                newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
-               configfile="${ED%/}"/etc/openldap/slapd.conf
+               configfile="${ED}"/etc/openldap/slapd.conf
 
                # populate with built backends
                ebegin "populate config with built backends"
-               for x in "${ED%/}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+               for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
                        einfo "Adding $(basename ${x})"
                        sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
                done
@@ -775,7 +775,7 @@ multilib_src_install() {
                # If built without SLP, we don't need to be before avahi
                        sed -i \
                                -e '/before/{s/avahi-daemon//g}' \
-                               "${ED%/}"/etc/init.d/slapd \
+                               "${ED}"/etc/init.d/slapd \
                                || die
 
                if use cxx ; then
@@ -809,7 +809,7 @@ multilib_src_install() {
                for l in */*.la */*/*.la; do
                        [[ -e ${l} ]] || continue
                        "${lt}" --mode=install cp ${l} \
-                               "${ED%/}"/usr/$(get_libdir)/openldap/openldap || \
+                               "${ED}"/usr/$(get_libdir)/openldap/openldap || \
                                die "installing ${l} failed"
                done