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 2417E138334 for ; Wed, 20 Jun 2018 07:12:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CD74E0869; Wed, 20 Jun 2018 07:11:59 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (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 B88A7E07D3 for ; Wed, 20 Jun 2018 07:11:58 +0000 (UTC) From: "Marty E. Plummer" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1529478716; bh=jGI3sDu/pFQldWAaoJUVJyPt2DHG9UEe6vSOCVvx3uE=; h=From:To:Cc:Subject:Date:From; b=qs/8kFy6IK2rLht3RgvTw1sC1nr1jOj6VxbbapP+Mi1ORSB7xuyckVIxYrIP4ML3U 1Dwu7XmE80zw/jXiOZZmZooIE+cV7GzIL1qgl2Aa1UajSwC6qKneBzSrl6YiT2rFkF iUW+pUhxnqYv88uIOU+uQ9lKkOQuDFpb/XBua6PQnlshIox/qJl0sqHKTgVaN0ysBE lr6fN8MCNlKr0mhdLNJRbNpsmHi7dgXOszIThQGfwzzfZhC9xhfaO0jWwUpRM7ZUzk LjO9Bz308Nhl/J+LGMTuyJ40BNMzahFOxMJawwAetWGCowZLT9aLAU2dgMSFeRY1ql OlqOXqE3N7hOw== To: gentoo-dev@lists.gentoo.org Cc: "Marty E. Plummer" Subject: [gentoo-dev] [PATCH 1/4] xdg-utils.eclass: make EAPI 7 ready Date: Wed, 20 Jun 2018 02:10:50 -0500 Message-Id: <20180620071053.11589-1-hanetzer@startmail.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 X-Archives-Salt: de82df27-6e55-4ac4-8d91-2f3447ee5432 X-Archives-Hash: 3941de462d943cd70061b99d9e7e7598 Use ${EROOT%/} whereever possible, as the tools and directories which are used with it are already prefixed with a / Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- eclass/xdg-utils.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass index ac075185d8e..8dba5ed6861 100644 --- a/eclass/xdg-utils.eclass +++ b/eclass/xdg-utils.eclass @@ -15,7 +15,7 @@ # * XDG mime information database management case "${EAPI:-0}" in - 0|1|2|3|4|5|6) ;; + 0|1|2|3|4|5|6|7) ;; *) die "EAPI=${EAPI} is not supported" ;; esac @@ -66,7 +66,7 @@ xdg_environment_reset() { # Updates the .desktop files database. # Generates a list of mimetypes linked to applications that can handle them xdg_desktop_database_update() { - local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}" + local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}" if [[ ${EBUILD_PHASE} != post* ]] ; then die "xdg_desktop_database_update must be used in pkg_post* phases." @@ -78,7 +78,7 @@ xdg_desktop_database_update() { fi ebegin "Updating .desktop files database" - "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}" + "${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}" eend $? } @@ -87,7 +87,7 @@ xdg_desktop_database_update() { # Update the mime database. # Creates a general list of mime types from several sources xdg_mimeinfo_database_update() { - local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}" + local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}" if [[ ${EBUILD_PHASE} != post* ]] ; then die "xdg_mimeinfo_database_update must be used in pkg_post* phases." @@ -99,6 +99,6 @@ xdg_mimeinfo_database_update() { fi ebegin "Updating shared mime info database" - "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}" + "${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}" eend $? } -- 2.17.1