twitch153 15/07/02 14:02:34
Modified: webapp.eclass
Log:
webapp.eclass: Updates eclass to reflect migration from optparse to argparse
These changes move the command line args for -I/-C/-U to the ${PN} and the
${PV}
vars. This ensures both forwards and backwards compatibility.
Revision Changes Path
1.74 eclass/webapp.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.74&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.74&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?r1=1.73&r2=1.74
Index: webapp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- webapp.eclass 12 May 2015 15:15:31 -0000 1.73
+++ webapp.eclass 2 Jul 2015 14:02:34 -0000 1.74
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.73 2015/05/12
15:15:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.74 2015/07/02
14:02:34 twitch153 Exp $
# @ECLASS: webapp.eclass
# @MAINTAINER:
@@ -244,6 +244,7 @@
local my_file="$(webapp_strip_appdir "${1}")"
my_file="$(webapp_strip_cwd "${my_file}")"
+ elog "(server owned) ${my_file}"
echo "${my_file}" >> "${D}/${WA_SOLIST}"
}
@@ -412,9 +413,7 @@
ewarn "This ebuild may be overwriting important files."
ewarn
echo
- if has "${EAPI:-0}" 0 1 2; then
- ebeep 10
- fi
+ ebeep 10
elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then
echo
eerror "You already have ${my_output} installed in ${my_dir}"
@@ -502,12 +501,12 @@
elog "${PN}-${PVR} is not installed - using
install mode"
fi
- my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u
root -d ${INSTALL_DIR} ${PN} ${PVR}"
+ my_cmd="${WEBAPP_CONFIG} -h localhost -u root -d
${INSTALL_DIR} ${my_mode} ${PN} ${PVR}"
elog "Running ${my_cmd}"
${my_cmd}
echo
- local cleaner="${WEBAPP_CLEANER} -p -C /${PN}"
+ local cleaner="${WEBAPP_CLEANER} -p -C
${CATEGORY}/${PN}"
einfo "Running ${cleaner}"
${cleaner}
else
@@ -518,7 +517,7 @@
elog
elog "To install ${PN}-${PVR} into a virtual host, run
the following command:"
elog
- elog " webapp-config -I -h <host> -d ${PN} ${PN}
${PVR}"
+ elog " webapp-config -h <host> -d ${PN} -I ${PN}
${PVR}"
elog
elog "For more details, see the webapp-config(8) man
page"
fi
@@ -530,7 +529,7 @@
elog
elog "To install ${PN}-${PVR} into a virtual host, run the
following command:"
elog
- elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
+ elog " webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}"
elog
elog "For more details, see the webapp-config(8) man page"
fi
@@ -554,7 +553,7 @@
if [[ -f "${x}"/.webapp ]]; then
. "${x}"/.webapp
if [[ -n "${WEB_HOSTNAME}" && -n
"${WEB_INSTALLDIR}" ]]; then
- ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME}
-d ${WEB_INSTALLDIR} ${PN} ${PVR}
+ ${WEBAPP_CONFIG} -h ${WEB_HOSTNAME} -d
${WEB_INSTALLDIR} -C ${PN} ${PVR}
fi
else
ewarn "Cannot find file ${x}/.webapp"
