[gentoo-commits] proj/webapp-config:experimental commit in: eclass/

[Devan Franchini]

commit:     6ad6ca58dee0f58ba09910d383aeac10cb14b4f2
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 23:27:54 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:19:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=6ad6ca58

webapp.eclass: Changes order of command line flags

The change from optparse to argparse requires the flags for upgrading,
installing, or removing a webapp to specify both package name and
package version after the flag.

 eclass/webapp.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index ff79700..3d4ca28 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -501,12 +501,12 @@ webapp_pkg_postinst() {
                                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
@@ -517,7 +517,7 @@ webapp_pkg_postinst() {
                        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
@@ -529,7 +529,7 @@ webapp_pkg_postinst() {
                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
@@ -553,7 +553,7 @@ webapp_pkg_prerm() {
                        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"