/[gentoo-x86]/eclass/webapp.eclass
Gentoo

Diff of /eclass/webapp.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.67 Revision 1.72
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.67 2011/07/12 07:48:01 lxnay Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.72 2012/07/18 14:59:29 blueness Exp $
4 4
5# @ECLASS: webapp.eclass 5# @ECLASS: webapp.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# web-apps@gentoo.org 7# web-apps@gentoo.org
8# @BLURB: functions for installing applications to run under a web server 8# @BLURB: functions for installing applications to run under a web server
57 debug-print-function $FUNCNAME $* 57 debug-print-function $FUNCNAME $*
58 58
59 if has_version '>=app-admin/webapp-config-1.50'; then 59 if has_version '>=app-admin/webapp-config-1.50'; then
60 ENVVAR=$(${WEBAPP_CONFIG} --query ${PN} ${PVR}) || die "Could not read settings from webapp-config!" 60 ENVVAR=$(${WEBAPP_CONFIG} --query ${PN} ${PVR}) || die "Could not read settings from webapp-config!"
61 eval ${ENVVAR} 61 eval ${ENVVAR}
62 else 62 elif [[ "${WEBAPP_OPTIONAL}" != "yes" ]]; then
63 # ETC_CONFIG might not be available
64 . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}"
65 elif [[ -f "${ETC_CONFIG}" ]]; then
66 # WEBAPP_OPTIONAL is set to yes
67 # and this must run only if ETC_CONFIG actually exists
63 . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}" 68 . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}"
64 fi 69 fi
65} 70}
66 71
67# Check whether a specified file exists in the given directory (`.' by default) 72# Check whether a specified file exists in the given directory (`.' by default)
406 ewarn "compatible with webapp-config." 411 ewarn "compatible with webapp-config."
407 ewarn 412 ewarn
408 ewarn "This ebuild may be overwriting important files." 413 ewarn "This ebuild may be overwriting important files."
409 ewarn 414 ewarn
410 echo 415 echo
416 if has "${EAPI:-0}" 0 1 2; then
411 ebeep 10 417 ebeep 10
418 fi
412 elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then 419 elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then
413 echo 420 echo
414 eerror "You already have ${my_output} installed in ${my_dir}" 421 eerror "You already have ${my_output} installed in ${my_dir}"
415 eerror 422 eerror
416 eerror "I cannot upgrade a different application" 423 eerror "I cannot upgrade a different application"
499 my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}" 506 my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}"
500 elog "Running ${my_cmd}" 507 elog "Running ${my_cmd}"
501 ${my_cmd} 508 ${my_cmd}
502 509
503 echo 510 echo
504 local cleaner="${WEBAPP_CLEANER} -p -C ${PN}" 511 local cleaner="${WEBAPP_CLEANER} -p -C /${PN}"
505 einfo "Running ${cleaner}" 512 einfo "Running ${cleaner}"
506 ${cleaner} 513 ${cleaner}
507 else 514 else
508 elog 515 elog
509 elog "The 'vhosts' USE flag is switched ON" 516 elog "The 'vhosts' USE flag is switched ON"

Legend:
Removed from v.1.67  
changed lines
  Added in v.1.72

  ViewVC Help
Powered by ViewVC 1.1.20