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 21A01138334 for ; Wed, 22 May 2019 17:33:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D217E08AB; Wed, 22 May 2019 17:33:42 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15382E08AB for ; Wed, 22 May 2019 17:33:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B62C7344E03 for ; Wed, 22 May 2019 17:33:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D66E5DC for ; Wed, 22 May 2019 17:33:37 +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: <1558546091.2f1b427e47422df8c7e6d1504d89988fa48fe004.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/auto-bootstraps/dobootstrap X-VCS-Directories: scripts/auto-bootstraps/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 2f1b427e47422df8c7e6d1504d89988fa48fe004 X-VCS-Branch: master Date: Wed, 22 May 2019 17:33:37 +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: 3cbf47dd-8036-4b07-8cb5-43a79ece6a04 X-Archives-Hash: a2032226a5c1985fb56dae10b989ecb2 commit: 2f1b427e47422df8c7e6d1504d89988fa48fe004 Author: Fabian Groffen gentoo org> AuthorDate: Wed May 22 17:28:11 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed May 22 17:28:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2f1b427e scripts/auto-bootstraps/dobootstrap: refine shell usage - reuse bash shell the script was invoked with to launch bootstrap-prefix.sh - set SHELL=/bin/sh for maximum compatability - avoid env exec error when GENTOO_MIRRORS is empty Signed-off-by: Fabian Groffen gentoo.org> scripts/auto-bootstraps/dobootstrap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap index e27bb0eeee..de986e0169 100755 --- a/scripts/auto-bootstraps/dobootstrap +++ b/scripts/auto-bootstraps/dobootstrap @@ -112,18 +112,18 @@ do_prepare() { starttime=${SECONDS} env -i \ HOME=${EPREFIX} \ - SHELL=/bin/bash \ + SHELL=/bin/sh \ TERM=${TERM} \ USER=${USER} \ CHOST=${chost} \ EPREFIX=${EPREFIX} \ - ${GENTOO_MIRRORS+GENTOO_MIRRORS=}${GENTOO_MIRRORS} \ + ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \ ${DOLOCAL+DOLOCAL=1} \ ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE=libressl} \ ${RESUME+RESUME=1} \ ${LATEST_TREE_YES+LATEST_TREE_YES=1} \ ${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \ - ${keepalive} /bin/bash -l -c "${BASH} ${bootstrapscript} bootstrap" + ${keepalive} ${BASH} ${bootstrapscript} bootstrap endtime=${SECONDS} if [[ -n ${DOPUBLISH} ]] ; then