Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 20 Jan 2020 10:49:48
Message-Id: 1579517378.c2014cee0296e18d28445dca334a07b22cae6af0.zlogene@gentoo
1 commit: c2014cee0296e18d28445dca334a07b22cae6af0
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 20 10:46:43 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 20 10:49:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2014cee
7
8 Revert "texlive-common.eclass: kill even more POSIXism"
9
10 This reverts commit 57e379ccf655a2c767260f3c298a9c7edf290d52.
11
12 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
13
14 eclass/texlive-common.eclass | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
18 index 4e6795b2d98..726f94dacfc 100644
19 --- a/eclass/texlive-common.eclass
20 +++ b/eclass/texlive-common.eclass
21 @@ -85,7 +85,8 @@ texlive-common_do_symlinks() {
22 if [[ $1 = $2 ]];
23 then
24 einfo "Symlink $1 -> $2 skipped"
25 - elif [[ -e ${ED}/usr/bin/$1 || -L ${ED}/usr/bin/$1 ]]; then
26 + elif [[ -e ${ED}/usr/bin/$1 -o -L ${ED}/usr/bin/$1 ]];
27 + then
28 einfo "Symlink $1 skipped (file exists)"
29 else
30 einfo "Making symlink from $1 to $2"