From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-940562-garchives=archives.gentoo.org@lists.gentoo.org>
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 2F78D139694
	for <garchives@archives.gentoo.org>; Thu, 23 Mar 2017 17:46:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 43B4221C121;
	Thu, 23 Mar 2017 17:46:33 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1DE9D21C121
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Mar 2017 17:46:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id D3DA333D3C7
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Mar 2017 17:46:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 72A317267
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Mar 2017 17:46:29 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
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" <grobian@gentoo.org>
Message-ID: <1490291183.2c8af75d7929f4db1e606056cc11dbc4a0668370.grobian@gentoo>
Subject: [gentoo-commits] proj/portage:prefix commit in: /
X-VCS-Repository: proj/portage
X-VCS-Files: .travis.yml
X-VCS-Directories: /
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 2c8af75d7929f4db1e606056cc11dbc4a0668370
X-VCS-Branch: prefix
Date: Thu, 23 Mar 2017 17:46:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 67e44ef5-6da0-4434-9d62-1cfd92e60333
X-Archives-Hash: 048989d6dc99ea8165c72a15260f5e81

commit:     2c8af75d7929f4db1e606056cc11dbc4a0668370
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 17:46:23 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 17:46:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2c8af75d

travis: make configured values reflect build-env

 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 467bc3cb7..c0157332d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,16 +21,16 @@ script:
     - printf "[build_ext]\nportage-ext-modules=true" >> setup.cfg
     - find . -type f -exec
           sed -e "s|@PORTAGE_EPREFIX@||"
-              -e "s|@PORTAGE_MV@|/bin/mv|"
-              -e "s|@PORTAGE_BASH@|/bin/bash|"
+              -e "s|@PORTAGE_MV@|$(type -P mv)|"
+              -e "s|@PORTAGE_BASH@|$(type -P bash)|"
               -e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|"
               -e "s|@DEFAULT_PATH@|/usr/bin:/bin|"
               -e "s|@EXTRA_PATH@|/usr/sbin:/sbin|"
-              -e "s|@portagegroup@|portage|"
-              -e "s|@portageuser@|portage|"
-              -e "s|@rootuser@|root|"
-              -e "s|@rootuid@|0|"
-              -e "s|@rootgid@|0|"
+              -e "s|@portagegroup@|$(id -gn)|"
+              -e "s|@portageuser@|$(id -un)|"
+              -e "s|@rootuser@|$(id -un)|"
+              -e "s|@rootuid@|$(id -u)|"
+              -e "s|@rootgid@|$(id -g)|"
               -e "s|@sysconfdir@|/etc|"
               -i '{}' +
     - ./setup.py test