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 6D64C1382C5 for ; Thu, 7 Jan 2021 15:31:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CA5CE0841; Thu, 7 Jan 2021 15:31:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 46DBFE0844 for ; Thu, 7 Jan 2021 15:31:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53BD6340F2B for ; Thu, 7 Jan 2021 15:31:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2FEA48D for ; Thu, 7 Jan 2021 15:31:31 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1610033488.280c4f83d84818e3ba4391b1c7f69f8711870e39.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/baikal/baikal-0.7.2.ebuild X-VCS-Directories: www-apps/baikal/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 280c4f83d84818e3ba4391b1c7f69f8711870e39 X-VCS-Branch: master Date: Thu, 7 Jan 2021 15:31:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2dabce69-e5a6-4986-bf76-3e5546472e91 X-Archives-Hash: 3184742766ad13c4fe0221c67feee442 commit: 280c4f83d84818e3ba4391b1c7f69f8711870e39 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 7 15:31:23 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 7 15:31:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280c4f83 www-apps/baikal: use relative symlink to config Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> www-apps/baikal/baikal-0.7.2.ebuild | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/www-apps/baikal/baikal-0.7.2.ebuild b/www-apps/baikal/baikal-0.7.2.ebuild index 39d0aca079d..373282d259b 100644 --- a/www-apps/baikal/baikal-0.7.2.ebuild +++ b/www-apps/baikal/baikal-0.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -34,15 +34,19 @@ src_install() { einfo "Setting up container for configuration" dodir /etc/${PN} - einfo "Fixing symlinks" - local link target - find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do - target=$(readlink "${link}") - target=${target/..\/Core/Core} - rm "${link}" && ln -s "${target}" "${link}" + # setup config in /etc + # we are not allowed to use straight-forward absolute symlink :( + local root path htdocsdir=${MY_HTDOCSDIR%/} + while [[ -n ${htdocsdir} ]] ; do + root+="../" + htdocsdir=${htdocsdir%/*} + # trim duplicate slashes + while [[ ${htdocsdir} == */ ]] ; do + htdocsdir=${htdocsdir%/} + done done - dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific - dosym /etc/${PN} "${MY_HTDOCSDIR}"/config + dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/Specific + dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/config dosym . "${MY_HTDOCSDIR}"/html webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"