diff options
Diffstat (limited to 'app-admin/eselect-postgresql/files/postgresql.eselect')
| -rw-r--r-- | app-admin/eselect-postgresql/files/postgresql.eselect | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app-admin/eselect-postgresql/files/postgresql.eselect b/app-admin/eselect-postgresql/files/postgresql.eselect index e48fb13..05ba7fb 100644 --- a/app-admin/eselect-postgresql/files/postgresql.eselect +++ b/app-admin/eselect-postgresql/files/postgresql.eselect @@ -1,4 +1,4 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id: $ @@ -18,7 +18,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) do_list() { write_list_start "Available postgresql installations" - for s in /usr/lib/eselect-postgresql/slots/* ; do + for s in /etc/eselect/postgresql/slots/* ; do [[ -d "$s" ]] || continue; local slot=$(basename $s) local postgres_ebuilds="" @@ -93,7 +93,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) do_set() { local alibdir='/usr/lib/' [[ ${#@} -ne 1 ]] && die -q "Only one parameter is expected" - local slotdir="/usr/lib/eselect-postgresql/slots/${1}" + local slotdir="/etc/eselect/postgresql/slots/${1}" [[ -d "${slotdir}" ]] || die -q "No such version installed" do_reset unset postgres_symlinks @@ -124,8 +124,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) done mkdir -p /etc/eselect/postgresql &>/dev/null || die "Failed to create /etc/eselect/postgresql" exec 9>/etc/eselect/postgresql/active.links || die "Failed to store list of links" - rm -f /etc/eselect/postgresql/active - ln -s "${slotdir}" /etc/eselect/postgresql/active + ln -sf slots/${1} /etc/eselect/postgresql/active for (( i=0;i<slinks;i++ )); do local s=${postgres_symlinks[i]}; (( i++ )); @@ -147,7 +146,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) do_set-service() { local alibdir='/usr/lib/' [[ ${#@} -ne 1 ]] && die -q "Only one parameter is expected" - local slotdir="/usr/lib/eselect-postgresql/slots/${1}" + local slotdir="/etc/eselect/postgresql/slots/${1}" [[ -d "${slotdir}" ]] || die -q "No such version installed" do_reset-service unset postgres_service @@ -155,7 +154,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) [[ -x "/etc/init.d/${p_service}" ]] || die -1 "Selected installation doesn't provide PostgreSQL service" mkdir -p /etc/eselect/postgresql &>/dev/null || die "Failed to create /etc/eselect/postgresql" rm -f /etc/eselect/postgresql/service - ln -s "${slotdir}" /etc/eselect/postgresql/service + ln -sf slots/${1} /etc/eselect/postgresql/service touch /etc/conf.d/${p_service} } ## }}} @@ -239,7 +238,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) do_update() { # collect all binaries names local binaries="$(( - for s in /usr/lib/eselect-postgresql/slots/* ; do + for s in /etc/eselect/postgresql/slots/* ; do [[ -d "$s" ]] || continue; local slot=$(basename $s) for src in ${s}/* ; do |