diff options
Diffstat (limited to 'dev-db/postgresql/postgresql-10.10.ebuild')
| -rw-r--r-- | dev-db/postgresql/postgresql-10.10.ebuild | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild index 4c21bf2c2fd8..85088dae2645 100644 --- a/dev-db/postgresql/postgresql-10.10.ebuild +++ b/dev-db/postgresql/postgresql-10.10.ebuild @@ -132,7 +132,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -281,7 +281,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -292,11 +292,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -330,15 +330,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -347,7 +347,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -359,7 +359,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -399,9 +399,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -444,7 +444,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } |