| 1 |
From: Conrad Kostecki <conrad@××××××××.com> |
| 2 |
|
| 3 |
Closes: https://bugs.gentoo.org/671258 |
| 4 |
Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
| 5 |
--- |
| 6 |
eclass/webapp.eclass | 14 +++++++------- |
| 7 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass |
| 10 |
index 8983af334ab..e11835735ca 100644 |
| 11 |
--- a/eclass/webapp.eclass |
| 12 |
+++ b/eclass/webapp.eclass |
| 13 |
@@ -42,9 +42,9 @@ IS_REPLACE=0 |
| 14 |
INSTALL_CHECK_FILE="installed_by_webapp_eclass" |
| 15 |
SETUP_CHECK_FILE="setup_by_webapp_eclass" |
| 16 |
|
| 17 |
-ETC_CONFIG="${ROOT}etc/vhosts/webapp-config" |
| 18 |
-WEBAPP_CONFIG="${ROOT}usr/sbin/webapp-config" |
| 19 |
-WEBAPP_CLEANER="${ROOT}usr/sbin/webapp-cleaner" |
| 20 |
+ETC_CONFIG="${ROOT%/}/etc/vhosts/webapp-config" |
| 21 |
+WEBAPP_CONFIG="${ROOT%/}/usr/sbin/webapp-config" |
| 22 |
+WEBAPP_CLEANER="${ROOT%/}/usr/sbin/webapp-cleaner" |
| 23 |
|
| 24 |
# ============================================================================== |
| 25 |
# INTERNAL FUNCTIONS |
| 26 |
@@ -365,7 +365,7 @@ webapp_src_preinst() { |
| 27 |
# @DESCRIPTION: |
| 28 |
# The default pkg_setup() for this eclass. This will gather required variables |
| 29 |
# from webapp-config and check if there is an application installed to |
| 30 |
-# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. |
| 31 |
+# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. |
| 32 |
# |
| 33 |
# You need to call this function BEFORE anything else has run in your custom |
| 34 |
# pkg_setup(). |
| 35 |
@@ -389,7 +389,7 @@ webapp_pkg_setup() { |
| 36 |
G_HOSTNAME="localhost" |
| 37 |
webapp_read_config |
| 38 |
|
| 39 |
- local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" |
| 40 |
+ local my_dir="${ROOT%/}/${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" |
| 41 |
|
| 42 |
# if USE=vhosts is enabled OR no application is installed we're done here |
| 43 |
if ! has vhosts ${IUSE} || use vhosts || [[ ! -d "${my_dir}" ]]; then |
| 44 |
@@ -453,7 +453,7 @@ webapp_src_install() { |
| 45 |
# @FUNCTION: webapp_pkg_postinst |
| 46 |
# @DESCRIPTION: |
| 47 |
# The default pkg_postinst() for this eclass. This installs the web application to |
| 48 |
-# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise |
| 49 |
+# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise |
| 50 |
# display a short notice how to install this application with webapp-config. |
| 51 |
# |
| 52 |
# You need to call this function AFTER everything else has run in your custom |
| 53 |
@@ -464,7 +464,7 @@ webapp_pkg_postinst() { |
| 54 |
webapp_read_config |
| 55 |
|
| 56 |
# sanity checks, to catch bugs in the ebuild |
| 57 |
- if [[ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then |
| 58 |
+ if [[ ! -f "${ROOT%/}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then |
| 59 |
eerror |
| 60 |
eerror "This ebuild did not call webapp_src_install() at the end" |
| 61 |
eerror "of the src_install() function" |
| 62 |
-- |
| 63 |
2.19.1 |
Archives