From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD766138334 for ; Sat, 17 Nov 2018 20:35:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F455E0B61; Sat, 17 Nov 2018 20:35:16 +0000 (UTC) Received: from mx1.mailbox.org (mx1.mailbox.org [IPv6:2001:67c:2050:104:0:1:25:1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03EA1E0B54 for ; Sat, 17 Nov 2018 20:35:14 +0000 (UTC) Received: from smtp2.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 8637443738; Sat, 17 Nov 2018 21:35:12 +0100 (CET) Authentication-Results: spamfilter03.heinlein-hosting.de (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kostecki.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kostecki.com; h= content-transfer-encoding:mime-version:message-id:date:date :subject:subject:from:from:received; s=dkim; t=1542486911; bh=WH dxYtR0db3LVITbc6+Urnnsp6MRbE00wnAuppdBYIs=; b=Kc5s5bJf3fh9triLmy 9c6mYkiPyvuogEfw03QLs5oPawZNNSkV+dIdjC3kgdIw25/um2riVAreLzblyg7X RcdFUPhyLQNWgt34XBaFi4aNRznCN+mUbTw2G1TXbPRPS0IO5RJOIjdKHihfVrmI LX8+QAOyDOu+C9aSdRvZ1D9nLCZ9FjeI7eHi7sO0b7Ny6NxIQ6hpShv8m+cSv7t7 HQFPoOKIcLUV46FHn4jeOD24b2B7IpeNNKLbKN+5q4Gmaxo2f5FwFFOzJbxpzEeF COsRRiJ1fsDcVaQUgp5Gvs6wPVsMO9UX82uekrILPkD9VJqeEsPyfEA2/DAlA4iD 9LW2cH2rtURpmNG74x3zQtl73+xWJohyfWp78/b7VljLDtX7ctYn1zif1Aak7Ok9 sRVVmQ8GLbMTYj2O0PrUcSO9OmACW8fp+ZIShjuMwiYtsxFpauO62dA2OeyxSd3e 02giiou4IGy4z9D8SRE32vzNjoDKjz0tKwzNzugzmN8hD8Quwb9+f4XgiHKgu8Eo Isd3lQLV2rH38vvRZKCHJcCHN3Xa7XpWxOZRcTzYizqoAw7qebHy212f79AzMXoU OEBrBnTI5d/w5LE0x4IWVnGQhvnLdrwHrXjyk+6i3oZzlt9NUDxVz2tjOGld+8Df RXjw0WCOl3Gh4M7Tvm7Ern/I8= X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id nuquHoK_Tahb; Sat, 17 Nov 2018 21:35:11 +0100 (CET) From: conrad@kostecki.com To: gentoo-dev@lists.gentoo.org Cc: Conrad Kostecki Subject: [gentoo-dev] [PATCH] eclass/webapp.eclass: fix ROOT path with EAPI=7 Date: Sat, 17 Nov 2018 21:35:10 +0100 Message-Id: <20181117203510.2502-1-conrad@kostecki.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: e32e80fc-7a9e-46b5-bf9a-d01e08f2473d X-Archives-Hash: 5a2b66ec8284019affc524b7e39ad2b0 From: Conrad Kostecki Closes: https://bugs.gentoo.org/671258 Signed-off-by: Conrad Kostecki --- eclass/webapp.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index 8983af334ab..e11835735ca 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -42,9 +42,9 @@ IS_REPLACE=0 INSTALL_CHECK_FILE="installed_by_webapp_eclass" SETUP_CHECK_FILE="setup_by_webapp_eclass" -ETC_CONFIG="${ROOT}etc/vhosts/webapp-config" -WEBAPP_CONFIG="${ROOT}usr/sbin/webapp-config" -WEBAPP_CLEANER="${ROOT}usr/sbin/webapp-cleaner" +ETC_CONFIG="${ROOT%/}/etc/vhosts/webapp-config" +WEBAPP_CONFIG="${ROOT%/}/usr/sbin/webapp-config" +WEBAPP_CLEANER="${ROOT%/}/usr/sbin/webapp-cleaner" # ============================================================================== # INTERNAL FUNCTIONS @@ -365,7 +365,7 @@ webapp_src_preinst() { # @DESCRIPTION: # The default pkg_setup() for this eclass. This will gather required variables # from webapp-config and check if there is an application installed to -# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. +# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. # # You need to call this function BEFORE anything else has run in your custom # pkg_setup(). @@ -389,7 +389,7 @@ webapp_pkg_setup() { G_HOSTNAME="localhost" webapp_read_config - local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" + local my_dir="${ROOT%/}/${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" # if USE=vhosts is enabled OR no application is installed we're done here if ! has vhosts ${IUSE} || use vhosts || [[ ! -d "${my_dir}" ]]; then @@ -453,7 +453,7 @@ webapp_src_install() { # @FUNCTION: webapp_pkg_postinst # @DESCRIPTION: # The default pkg_postinst() for this eclass. This installs the web application to -# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise +# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise # display a short notice how to install this application with webapp-config. # # You need to call this function AFTER everything else has run in your custom @@ -464,7 +464,7 @@ webapp_pkg_postinst() { webapp_read_config # sanity checks, to catch bugs in the ebuild - if [[ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then + if [[ ! -f "${ROOT%/}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then eerror eerror "This ebuild did not call webapp_src_install() at the end" eerror "of the src_install() function" -- 2.19.1