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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D12F8158095 for ; Wed, 13 Jul 2022 02:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80B0FE0D77; Wed, 13 Jul 2022 02:31:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EF1EE0D77 for ; Wed, 13 Jul 2022 02:31:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 725A13410FD for ; Wed, 13 Jul 2022 02:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C69C53B for ; Wed, 13 Jul 2022 02:31:21 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1657677705.dddaef5cdd914e9542fbed2ba24fd0ee167e4ae2.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/R-packages.eclass X-VCS-Directories: eclass/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: dddaef5cdd914e9542fbed2ba24fd0ee167e4ae2 X-VCS-Branch: dev Date: Wed, 13 Jul 2022 02:31:21 +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: 54dfe246-b8b1-4fe4-8666-05d71d6cfb7e X-Archives-Hash: 9266ef0e0b1ba1f909a80a0a799a05ae commit: dddaef5cdd914e9542fbed2ba24fd0ee167e4ae2 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Jul 13 02:01:06 2022 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Wed Jul 13 02:01:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dddaef5c R-packages.eclass: name variables in _movelink Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> eclass/R-packages.eclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index ad76d1206..cf59fcaf9 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -61,14 +61,16 @@ RDEPEND="${DEPEND}" # @FUNCTION: _movelink # @INTERNAL -# @USAGE: [ ] +# @USAGE: # @DESCRIPTION: # will contain symlinks to everything in _movelink() { - if [[ -e "${1}" ]]; then - local rp1="$(realpath ${1} || die)" - mv "${rp1}" "${2}" || die - cp -rsf "${2}" "${rp1}" || die + local source=${1} + local dest=${2} + if [[ -e "${source}" ]]; then + local rp_source="$(realpath ${source} || die)" + mv "${rp_source}" "${dest}" || die + cp -rsf "${dest}" "${rp_source}" || die fi }