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

Diff of /eclass/webapp.eclass

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

Revision 1.54 Revision 1.70
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.54 2008/02/22 14:27:17 hollow Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.70 2011/12/27 17:55:12 fauli 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
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The webapp eclass contains functions to handle web applications with 10# The webapp eclass contains functions to handle web applications with
11# webapp-config. Part of the implementation of GLEP #11 11# webapp-config. Part of the implementation of GLEP #11
12 12
13# @ECLASS-VARIABLE: WEBAPP_DEPEND
14# @DESCRIPTION:
15# An ebuild should use WEBAPP_DEPEND if a custom DEPEND needs to be built, most
16# notably in combination with WEBAPP_OPTIONAL.
17WEBAPP_DEPEND=">=app-admin/webapp-config-1.50.15"
18
19# @ECLASS-VARIABLE: WEBAPP_NO_AUTO_INSTALL
20# @DESCRIPTION:
21# An ebuild sets this to `yes' if an automatic installation and/or upgrade is
22# not possible. The ebuild should overwrite pkg_postinst() and explain the
23# reason for this BEFORE calling webapp_pkg_postinst().
24
25# @ECLASS-VARIABLE: WEBAPP_OPTIONAL
26# @DESCRIPTION:
27# An ebuild sets this to `yes' to make webapp support optional, in which case
28# you also need to take care of USE-flags and dependencies.
29
30if [[ "${WEBAPP_OPTIONAL}" != "yes" ]]; then
31 [[ "${WEBAPP_NO_AUTO_INSTALL}" == "yes" ]] || IUSE="vhosts"
13SLOT="${PVR}" 32 SLOT="${PVR}"
14IUSE="vhosts" 33 DEPEND="${WEBAPP_DEPEND}"
15DEPEND=">=app-admin/webapp-config-1.50.15"
16RDEPEND="${DEPEND}" 34 RDEPEND="${DEPEND}"
35fi
17 36
18EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm 37EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm
19 38
20INSTALL_DIR="/${PN}" 39INSTALL_DIR="/${PN}"
21IS_UPGRADE=0 40IS_UPGRADE=0
22IS_REPLACE=0 41IS_REPLACE=0
23 42
24INSTALL_CHECK_FILE="installed_by_webapp_eclass" 43INSTALL_CHECK_FILE="installed_by_webapp_eclass"
44SETUP_CHECK_FILE="setup_by_webapp_eclass"
25 45
26ETC_CONFIG="${ROOT}etc/vhosts/webapp-config" 46ETC_CONFIG="${ROOT}etc/vhosts/webapp-config"
27WEBAPP_CONFIG="${ROOT}usr/sbin/webapp-config" 47WEBAPP_CONFIG="${ROOT}usr/sbin/webapp-config"
28WEBAPP_CLEANER="${ROOT}usr/sbin/webapp-cleaner" 48WEBAPP_CLEANER="${ROOT}usr/sbin/webapp-cleaner"
29 49
37 debug-print-function $FUNCNAME $* 57 debug-print-function $FUNCNAME $*
38 58
39 if has_version '>=app-admin/webapp-config-1.50'; then 59 if has_version '>=app-admin/webapp-config-1.50'; then
40 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!"
41 eval ${ENVVAR} 61 eval ${ENVVAR}
42 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
43 . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}" 68 . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}"
44 fi 69 fi
45} 70}
46 71
47# 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)
78 echo "${1/#.\///}" 103 echo "${1/#.\///}"
79} 104}
80 105
81webapp_getinstalltype() { 106webapp_getinstalltype() {
82 debug-print-function $FUNCNAME $* 107 debug-print-function $FUNCNAME $*
83 use vhosts && return 108
109 if ! has vhosts ${IUSE} || use vhosts; then
110 return
111 fi
84 112
85 local my_output 113 local my_output
86 my_output="$(webapp_check_installedat)" 114 my_output="$(webapp_check_installedat)"
87 115
88 if [[ $? -eq 0 ]]; then 116 if [[ $? -eq 0 ]]; then
96 124
97 if [[ "${my_pn}" == "${PN}" ]]; then 125 if [[ "${my_pn}" == "${PN}" ]]; then
98 if [[ "${my_pvr}" != "${PVR}" ]]; then 126 if [[ "${my_pvr}" != "${PVR}" ]]; then
99 elog "This is an upgrade" 127 elog "This is an upgrade"
100 IS_UPGRADE=1 128 IS_UPGRADE=1
129 # for binpkgs, reset status, var declared in global scope
130 IS_REPLACE=0
101 else 131 else
102 elog "This is a re-installation" 132 elog "This is a re-installation"
103 IS_REPLACE=1 133 IS_REPLACE=1
134 # for binpkgs, reset status, var declared in global scope
135 IS_UPGRADE=0
104 fi 136 fi
105 else 137 else
106 elog "${my_output} is installed there" 138 elog "${my_output} is installed there"
107 fi 139 fi
108 else 140 else
141 # for binpkgs, reset status, var declared in global scope
142 IS_REPLACE=0
143 IS_UPGRADE=0
109 elog "This is an installation" 144 elog "This is an installation"
110 fi 145 fi
111} 146}
112 147
113# ============================================================================== 148# ==============================================================================
114# PUBLIC FUNCTIONS 149# PUBLIC FUNCTIONS
115# ============================================================================== 150# ==============================================================================
116 151
152# @FUNCTION: need_httpd
153# @DESCRIPTION:
154# Call this function AFTER your ebuilds DEPEND line if any of the available
155# webservers are able to run this application.
156need_httpd() {
157 DEPEND="${DEPEND}
158 || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi )"
159}
160
161# @FUNCTION: need_httpd_cgi
162# @DESCRIPTION:
163# Call this function AFTER your ebuilds DEPEND line if any of the available
164# CGI-capable webservers are able to run this application.
165need_httpd_cgi() {
166 DEPEND="${DEPEND}
167 || ( virtual/httpd-cgi virtual/httpd-fastcgi )"
168}
169
170# @FUNCTION: need_httpd_fastcgi
171# @DESCRIPTION:
172# Call this function AFTER your ebuilds DEPEND line if any of the available
173# FastCGI-capabale webservers are able to run this application.
174need_httpd_fastcgi() {
175 DEPEND="${DEPEND}
176 virtual/httpd-fastcgi"
177}
178
117# @FUNCTION: webapp_configfile 179# @FUNCTION: webapp_configfile
118# @USAGE: <file> [more files ...] 180# @USAGE: <file> [more files ...]
119# @DESCRIPTION: 181# @DESCRIPTION:
120# Mark a file config-protected for a web-based application. 182# Mark a file config-protected for a web-based application.
121webapp_configfile() { 183webapp_configfile() {
170 232
171 webapp_checkfileexists "${2}" 233 webapp_checkfileexists "${2}"
172 234
173 elog "(info) ${2} (lang: ${1})" 235 elog "(info) ${2} (lang: ${1})"
174 cp "${2}" "${D}/${MY_APPDIR}/postupgrade-${1}.txt" 236 cp "${2}" "${D}/${MY_APPDIR}/postupgrade-${1}.txt"
237}
238
239# helper for webapp_serverowned()
240_webapp_serverowned() {
241 debug-print-function $FUNCNAME $*
242
243 webapp_checkfileexists "${1}" "${D}"
244 local my_file="$(webapp_strip_appdir "${1}")"
245 my_file="$(webapp_strip_cwd "${my_file}")"
246
247 elog "(server owned) ${my_file}"
248 echo "${my_file}" >> "${D}/${WA_SOLIST}"
175} 249}
176 250
177# @FUNCTION: webapp_serverowned 251# @FUNCTION: webapp_serverowned
178# @USAGE: [-R] <file> [more files ...] 252# @USAGE: [-R] <file> [more files ...]
179# @DESCRIPTION: 253# @DESCRIPTION:
185 259
186 local a m 260 local a m
187 if [[ "${1}" == "-R" ]]; then 261 if [[ "${1}" == "-R" ]]; then
188 shift 262 shift
189 for m in "$@"; do 263 for m in "$@"; do
190 for a in $(find ${D}/${m}); do 264 find "${D}${m}" | while read a; do
191 a=${a/${D}\/\///}
192 webapp_checkfileexists "${a}" "$D"
193 local my_file="$(webapp_strip_appdir "${a}")" 265 a=$(webapp_strip_d "${a}")
194 my_file="$(webapp_strip_cwd "${my_file}")" 266 _webapp_serverowned "${a}"
195
196 elog "(server owned) ${my_file}"
197 echo "${my_file}" >> "${D}/${WA_SOLIST}"
198 done 267 done
199 done 268 done
200 else 269 else
201 for m in "$@"; do 270 for m in "$@"; do
202 webapp_checkfileexists "${m}" "$D" 271 _webapp_serverowned "${m}"
203 local my_file="$(webapp_strip_appdir "${m}")"
204 my_file="$(webapp_strip_cwd "${my_file}")"
205
206 elog "(server owned) ${my_file}"
207 echo "${my_file}" >> "${D}/${WA_SOLIST}"
208 done 272 done
209 fi 273 fi
210} 274}
211 275
212# @FUNCTION: webapp_server_configfile 276# @FUNCTION: webapp_server_configfile
267# You need to call this function in src_install() BEFORE anything else has run. 331# You need to call this function in src_install() BEFORE anything else has run.
268# For now we just create required webapp-config directories. 332# For now we just create required webapp-config directories.
269webapp_src_preinst() { 333webapp_src_preinst() {
270 debug-print-function $FUNCNAME $* 334 debug-print-function $FUNCNAME $*
271 335
336 # sanity checks, to catch bugs in the ebuild
337 if [[ ! -f "${T}/${SETUP_CHECK_FILE}" ]]; then
338 eerror
339 eerror "This ebuild did not call webapp_pkg_setup() at the beginning"
340 eerror "of the pkg_setup() function"
341 eerror
342 eerror "Please log a bug on http://bugs.gentoo.org"
343 eerror
344 eerror "You should use emerge -C to remove this package, as the"
345 eerror "installation is incomplete"
346 eerror
347 die "Ebuild did not call webapp_pkg_setup() - report to http://bugs.gentoo.org"
348 fi
349
350 # Hint, see the webapp_read_config() function to find where these are
351 # defined.
272 dodir "${MY_HTDOCSDIR}" 352 dodir "${MY_HTDOCSDIR}"
273 dodir "${MY_HOSTROOTDIR}" 353 dodir "${MY_HOSTROOTDIR}"
274 dodir "${MY_CGIBINDIR}" 354 dodir "${MY_CGIBINDIR}"
275 dodir "${MY_ICONSDIR}" 355 dodir "${MY_ICONSDIR}"
276 dodir "${MY_ERRORSDIR}" 356 dodir "${MY_ERRORSDIR}"
281 361
282# ============================================================================== 362# ==============================================================================
283# EXPORTED FUNCTIONS 363# EXPORTED FUNCTIONS
284# ============================================================================== 364# ==============================================================================
285 365
286# @FUNCTION: webapp_src_install
287# @DESCRIPTION:
288# This is the default src_install(). For now, we just make sure that root owns
289# everything, and that there are no setuid files.
290#
291# You need to call this function AFTER everything else has run in your custom
292# src_install().
293webapp_src_install() {
294 debug-print-function $FUNCNAME $*
295
296 chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/"
297 chmod -R u-s "${D}/"
298 chmod -R g-s "${D}/"
299
300 keepdir "${MY_PERSISTDIR}"
301 fowners "root:0" "${MY_PERSISTDIR}"
302 fperms 755 "${MY_PERSISTDIR}"
303
304 # to test whether or not the ebuild has correctly called this function
305 # we add an empty file to the filesystem
306 #
307 # we used to just set a variable in the shell script, but we can
308 # no longer rely on Portage calling both webapp_src_install() and
309 # webapp_pkg_postinst() within the same shell process
310
311 touch "${D}/${MY_APPDIR}/${INSTALL_CHECK_FILE}"
312}
313
314# @FUNCTION: webapp_pkg_setup 366# @FUNCTION: webapp_pkg_setup
315# @DESCRIPTION: 367# @DESCRIPTION:
316# The default pkg_setup() for this eclass. This will gather required variables 368# The default pkg_setup() for this eclass. This will gather required variables
317# from webapp-config and check if there is an application installed to 369# from webapp-config and check if there is an application installed to
318# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. 370# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set.
320# You need to call this function BEFORE anything else has run in your custom 372# You need to call this function BEFORE anything else has run in your custom
321# pkg_setup(). 373# pkg_setup().
322webapp_pkg_setup() { 374webapp_pkg_setup() {
323 debug-print-function $FUNCNAME $* 375 debug-print-function $FUNCNAME $*
324 376
377 # to test whether or not the ebuild has correctly called this function
378 # we add an empty file to the filesystem
379 #
380 # we used to just set a variable in the shell script, but we can
381 # no longer rely on Portage calling both webapp_pkg_setup() and
382 # webapp_src_install() within the same shell process
383 touch "${T}/${SETUP_CHECK_FILE}"
384
325 # special case - some ebuilds *do* need to overwride the SLOT 385 # special case - some ebuilds *do* need to overwride the SLOT
326 if [[ "${SLOT}+" != "${PVR}+" && "${WEBAPP_MANUAL_SLOT}" != "yes" ]]; then 386 if [[ "${SLOT}+" != "${PVR}+" && "${WEBAPP_MANUAL_SLOT}" != "yes" ]]; then
327 die "Set WEBAPP_MANUAL_SLOT=\"yes\" if you need to SLOT manually" 387 die "Set WEBAPP_MANUAL_SLOT=\"yes\" if you need to SLOT manually"
328 fi 388 fi
329 389
332 webapp_read_config 392 webapp_read_config
333 393
334 local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" 394 local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
335 395
336 # if USE=vhosts is enabled OR no application is installed we're done here 396 # if USE=vhosts is enabled OR no application is installed we're done here
337 use vhosts || [[ ! -d "${my_dir}" ]] && return 397 if ! has vhosts ${IUSE} || use vhosts || [[ ! -d "${my_dir}" ]]; then
398 return
399 fi
338 400
339 local my_output 401 local my_output
340 my_output="$(webapp_check_installedat)" 402 my_output="$(webapp_check_installedat)"
341 403
342 if [[ $? -ne 0 ]]; then 404 if [[ $? -ne 0 ]]; then
343 # okay, whatever is there, it isn't webapp-config-compatible 405 # okay, whatever is there, it isn't webapp-config-compatible
406 echo
407 ewarn
344 ewarn "You already have something installed in ${my_dir}" 408 ewarn "You already have something installed in ${my_dir}"
345 ewarn 409 ewarn
346 ewarn "Whatever is in ${my_dir}, it's not" 410 ewarn "Whatever is in ${my_dir}, it's not"
347 ewarn "compatible with webapp-config." 411 ewarn "compatible with webapp-config."
348 ewarn 412 ewarn
349 ewarn "This ebuild may be overwriting important files." 413 ewarn "This ebuild may be overwriting important files."
350 ewarn 414 ewarn
415 echo
416 ebeep 10
351 elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then 417 elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then
352 eerror "${my_dir} contains ${my_output}" 418 echo
353 eerror "I cannot upgrade that" 419 eerror "You already have ${my_output} installed in ${my_dir}"
420 eerror
421 eerror "I cannot upgrade a different application"
422 eerror
423 echo
354 die "Cannot upgrade contents of ${my_dir}" 424 die "Cannot upgrade contents of ${my_dir}"
355 fi 425 fi
426
427}
428
429# @FUNCTION: webapp_src_install
430# @DESCRIPTION:
431# This is the default src_install(). For now, we just make sure that root owns
432# everything, and that there are no setuid files.
433#
434# You need to call this function AFTER everything else has run in your custom
435# src_install().
436webapp_src_install() {
437 debug-print-function $FUNCNAME $*
438
439 # to test whether or not the ebuild has correctly called this function
440 # we add an empty file to the filesystem
441 #
442 # we used to just set a variable in the shell script, but we can
443 # no longer rely on Portage calling both webapp_src_install() and
444 # webapp_pkg_postinst() within the same shell process
445 touch "${D}/${MY_APPDIR}/${INSTALL_CHECK_FILE}"
446
447 chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/"
448 chmod -R u-s "${D}/"
449 chmod -R g-s "${D}/"
450
451 keepdir "${MY_PERSISTDIR}"
452 fowners "root:0" "${MY_PERSISTDIR}"
453 fperms 755 "${MY_PERSISTDIR}"
356} 454}
357 455
358# @FUNCTION: webapp_pkg_postinst 456# @FUNCTION: webapp_pkg_postinst
359# @DESCRIPTION: 457# @DESCRIPTION:
360# The default pkg_postinst() for this eclass. This installs the web application to 458# The default pkg_postinst() for this eclass. This installs the web application to
380 eerror "installation is incomplete" 478 eerror "installation is incomplete"
381 eerror 479 eerror
382 die "Ebuild did not call webapp_src_install() - report to http://bugs.gentoo.org" 480 die "Ebuild did not call webapp_src_install() - report to http://bugs.gentoo.org"
383 fi 481 fi
384 482
483 if has vhosts ${IUSE}; then
385 if ! use vhosts; then 484 if ! use vhosts; then
386 echo 485 echo
387 elog "vhosts USE flag not set - auto-installing using webapp-config" 486 elog "vhosts USE flag not set - auto-installing using webapp-config"
388 487
389 webapp_getinstalltype
390
391 G_HOSTNAME="localhost" 488 G_HOSTNAME="localhost"
392 local my_mode=-I
393 webapp_read_config 489 webapp_read_config
394 490
491 local my_mode=-I
492 webapp_getinstalltype
493
395 if [[ "${IS_REPLACE}" == "1" ]]; then 494 if [[ "${IS_REPLACE}" == "1" ]]; then
396 elog "${PN}-${PVR} is already installed - replacing" 495 elog "${PN}-${PVR} is already installed - replacing"
397 my_mode=-I 496 my_mode=-I
398 elif [[ "${IS_UPGRADE}" == "1" ]]; then 497 elif [[ "${IS_UPGRADE}" == "1" ]]; then
399 elog "${REMOVE_PKG} is already installed - upgrading" 498 elog "${REMOVE_PKG} is already installed - upgrading"
400 my_mode=-U 499 my_mode=-U
500 else
501 elog "${PN}-${PVR} is not installed - using install mode"
502 fi
503
504 my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}"
505 elog "Running ${my_cmd}"
506 ${my_cmd}
507
508 echo
509 local cleaner="${WEBAPP_CLEANER} -p -C /${PN}"
510 einfo "Running ${cleaner}"
511 ${cleaner}
401 else 512 else
402 elog "${PN}-${PVR} is not installed - using install mode" 513 elog
514 elog "The 'vhosts' USE flag is switched ON"
515 elog "This means that Portage will not automatically run webapp-config to"
516 elog "complete the installation."
517 elog
518 elog "To install ${PN}-${PVR} into a virtual host, run the following command:"
519 elog
520 elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
521 elog
522 elog "For more details, see the webapp-config(8) man page"
403 fi 523 fi
404
405 my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}"
406 elog "Running ${my_cmd}"
407 ${my_cmd}
408
409 echo
410 local cleaner="${WEBAPP_CLEANER} -p -C ${PN}"
411 einfo "Running ${cleaner}"
412 ${cleaner}
413 else 524 else
414 elog 525 elog
415 elog "The 'vhosts' USE flag is switched ON" 526 elog "This ebuild does not support the 'vhosts' USE flag."
416 elog "This means that Portage will not automatically run webapp-config to" 527 elog "This means that Portage will not automatically run webapp-config to"
417 elog "complete the installation." 528 elog "complete the installation."
418 elog 529 elog
419 elog "To install ${PN}-${PVR} into a virtual host, run the following command:" 530 elog "To install ${PN}-${PVR} into a virtual host, run the following command:"
420 elog 531 elog
435 local my_output= 546 local my_output=
436 my_output="$(${WEBAPP_CONFIG} --list-installs ${PN} ${PVR})" 547 my_output="$(${WEBAPP_CONFIG} --list-installs ${PN} ${PVR})"
437 [[ $? -ne 0 ]] && return 548 [[ $? -ne 0 ]] && return
438 549
439 local x 550 local x
440 if ! use vhosts; then 551 if has vhosts ${IUSE} && ! use vhosts; then
441 552 echo "${my_output}" | while read x; do
442 for x in ${my_output}; do 553 if [[ -f "${x}"/.webapp ]]; then
443 [[ -f ${x}/.webapp ]] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp" 554 . "${x}"/.webapp
444 if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then 555 if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then
445 ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} 556 ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} ${PN} ${PVR}
557 fi
558 else
559 ewarn "Cannot find file ${x}/.webapp"
446 fi 560 fi
447 done 561 done
448 else 562 elif [[ "${my_output}" != "" ]]; then
449 563 echo
564 ewarn
450 ewarn "Don't forget to use webapp-config to remove any copies of" 565 ewarn "Don't forget to use webapp-config to remove any copies of"
451 ewarn "${PN}-${PVR} installed in" 566 ewarn "${PN}-${PVR} installed in"
452 ewarn 567 ewarn
453 568
454 for x in ${my_output}; do 569 echo "${my_output}" | while read x; do
455 [[ -f ${x}/.webapp ]] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp" 570 if [[ -f "${x}"/.webapp ]]; then
456 ewarn " ${x}" 571 ewarn " ${x}"
572 else
573 ewarn "Cannot find file ${x}/.webapp"
574 fi
457 done 575 done
576
577 ewarn
578 echo
458 fi 579 fi
459} 580}

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.70

  ViewVC Help
Powered by ViewVC 1.1.20