| 1 |
twitch153 15/07/02 14:02:34 |
| 2 |
|
| 3 |
Modified: webapp.eclass |
| 4 |
Log: |
| 5 |
webapp.eclass: Updates eclass to reflect migration from optparse to argparse |
| 6 |
|
| 7 |
These changes move the command line args for -I/-C/-U to the ${PN} and the ${PV} |
| 8 |
vars. This ensures both forwards and backwards compatibility. |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.74 eclass/webapp.eclass |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.74&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.74&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?r1=1.73&r2=1.74 |
| 16 |
|
| 17 |
Index: webapp.eclass |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v |
| 20 |
retrieving revision 1.73 |
| 21 |
retrieving revision 1.74 |
| 22 |
diff -u -r1.73 -r1.74 |
| 23 |
--- webapp.eclass 12 May 2015 15:15:31 -0000 1.73 |
| 24 |
+++ webapp.eclass 2 Jul 2015 14:02:34 -0000 1.74 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2015 Gentoo Foundation |
| 27 |
+# Copyright 1999-2011 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.73 2015/05/12 15:15:31 voyageur Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.74 2015/07/02 14:02:34 twitch153 Exp $ |
| 31 |
|
| 32 |
# @ECLASS: webapp.eclass |
| 33 |
# @MAINTAINER: |
| 34 |
@@ -244,6 +244,7 @@ |
| 35 |
local my_file="$(webapp_strip_appdir "${1}")" |
| 36 |
my_file="$(webapp_strip_cwd "${my_file}")" |
| 37 |
|
| 38 |
+ elog "(server owned) ${my_file}" |
| 39 |
echo "${my_file}" >> "${D}/${WA_SOLIST}" |
| 40 |
} |
| 41 |
|
| 42 |
@@ -412,9 +413,7 @@ |
| 43 |
ewarn "This ebuild may be overwriting important files." |
| 44 |
ewarn |
| 45 |
echo |
| 46 |
- if has "${EAPI:-0}" 0 1 2; then |
| 47 |
- ebeep 10 |
| 48 |
- fi |
| 49 |
+ ebeep 10 |
| 50 |
elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then |
| 51 |
echo |
| 52 |
eerror "You already have ${my_output} installed in ${my_dir}" |
| 53 |
@@ -502,12 +501,12 @@ |
| 54 |
elog "${PN}-${PVR} is not installed - using install mode" |
| 55 |
fi |
| 56 |
|
| 57 |
- my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}" |
| 58 |
+ my_cmd="${WEBAPP_CONFIG} -h localhost -u root -d ${INSTALL_DIR} ${my_mode} ${PN} ${PVR}" |
| 59 |
elog "Running ${my_cmd}" |
| 60 |
${my_cmd} |
| 61 |
|
| 62 |
echo |
| 63 |
- local cleaner="${WEBAPP_CLEANER} -p -C /${PN}" |
| 64 |
+ local cleaner="${WEBAPP_CLEANER} -p -C ${CATEGORY}/${PN}" |
| 65 |
einfo "Running ${cleaner}" |
| 66 |
${cleaner} |
| 67 |
else |
| 68 |
@@ -518,7 +517,7 @@ |
| 69 |
elog |
| 70 |
elog "To install ${PN}-${PVR} into a virtual host, run the following command:" |
| 71 |
elog |
| 72 |
- elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}" |
| 73 |
+ elog " webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}" |
| 74 |
elog |
| 75 |
elog "For more details, see the webapp-config(8) man page" |
| 76 |
fi |
| 77 |
@@ -530,7 +529,7 @@ |
| 78 |
elog |
| 79 |
elog "To install ${PN}-${PVR} into a virtual host, run the following command:" |
| 80 |
elog |
| 81 |
- elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}" |
| 82 |
+ elog " webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}" |
| 83 |
elog |
| 84 |
elog "For more details, see the webapp-config(8) man page" |
| 85 |
fi |
| 86 |
@@ -554,7 +553,7 @@ |
| 87 |
if [[ -f "${x}"/.webapp ]]; then |
| 88 |
. "${x}"/.webapp |
| 89 |
if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then |
| 90 |
- ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} ${PN} ${PVR} |
| 91 |
+ ${WEBAPP_CONFIG} -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} -C ${PN} ${PVR} |
| 92 |
fi |
| 93 |
else |
| 94 |
ewarn "Cannot find file ${x}/.webapp" |
Archives