diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-09-25 18:31:04 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-09-25 18:31:04 +0000 |
| commit | d2dc1591270d33ff68c3ac37e086037acf49cbca (patch) | |
| tree | 2cf2c282fae63cd479616c50eea5006ec69e5797 /www-apps/open-xchange | |
| parent | Added to ~ppc (diff) | |
| download | gentoo-2-d2dc1591270d33ff68c3ac37e086037acf49cbca.tar.gz gentoo-2-d2dc1591270d33ff68c3ac37e086037acf49cbca.tar.bz2 gentoo-2-d2dc1591270d33ff68c3ac37e086037acf49cbca.zip | |
Fixed autodetection in config.
(Portage version: 2.0.52-r1)
Diffstat (limited to 'www-apps/open-xchange')
| -rw-r--r-- | www-apps/open-xchange/open-xchange-0.8.1.2.ebuild | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild index a46c583b5a9c..e6c7f8af88c2 100644 --- a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild +++ b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.3 2005/09/24 23:38:37 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.4 2005/09/25 18:31:04 eradicator Exp $ inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache @@ -376,21 +376,21 @@ pkg_config() { local OX_ROOTPW=${OX_ROOTPW-"secret"} # Guess base on the installed config - if false && [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then + if [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then local temp_var echo "Installation of OX detected" temp_var=$(get_oxvar DEFAULT_SQL_HOST) - [[ -n ${temp_var} ]] && OX_DBHOST==${temp_var} + [[ -n ${temp_var} ]] && OX_DBHOST=${temp_var} temp_var=$(get_oxvar DEFAULT_SQL_DB) - [[ -n ${temp_var} ]] && OX_DBNAME==${temp_var} + [[ -n ${temp_var} ]] && OX_DBNAME=${temp_var} temp_var=$(get_oxvar DEFAULT_SQL_USER) - [[ -n ${temp_var} ]] && OX_DBUSER==${temp_var} + [[ -n ${temp_var} ]] && OX_DBUSER=${temp_var} temp_var=$(get_oxvar DEFAULT_SQL_PASS) - [[ -n ${temp_var} ]] && OX_DBPASS==${temp_var} + [[ -n ${temp_var} ]] && OX_DBPASS=${temp_var} temp_var=$(get_oxvar ORGA) [[ -n ${temp_var} ]] && OX_ORG=${temp_var} @@ -399,7 +399,7 @@ pkg_config() { [[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var} temp_var=$(get_oxvar BINDPW) - [[ -n ${temp_var} ]] && OX_ROOTPW=${OX_ROOTPW_TEMP} + [[ -n ${temp_var} ]] && OX_ROOTPW=${temp_var} if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then # taken from admintools.conf self |