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 E2714138359 for ; Tue, 20 Oct 2020 02:50:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E581FE0858; Tue, 20 Oct 2020 02:50:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D02A4E0858 for ; Tue, 20 Oct 2020 02:50:22 +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 695ED340CEF for ; Tue, 20 Oct 2020 02:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C51C63C0 for ; Tue, 20 Oct 2020 02:50:17 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1603162208.1ef11ad8950e12aa4fe0e11c2deaab8989f87fd7.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 1ef11ad8950e12aa4fe0e11c2deaab8989f87fd7 X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 02:50:17 +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: e95c022a-e093-410a-8cb1-ed836247c541 X-Archives-Hash: 5de046e596435f9b768faf37350b4ab6 commit: 1ef11ad8950e12aa4fe0e11c2deaab8989f87fd7 Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 22:42:13 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 02:50:08 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1ef11ad8 targets: Inline run_default_funcs() function Signed-off-by: Matt Turner gentoo.org> targets/support/chroot-functions.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index b531eb6a..307a9042 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -303,15 +303,6 @@ show_debug() { fi } -run_default_funcs() { - if [ "${RUN_DEFAULT_FUNCS}" != "no" ] - then - update_env_settings - setup_features - show_debug - fi -} - create_handbook_icon() { # This function creates a local icon to the Gentoo Handbook echo "[Desktop Entry] @@ -330,5 +321,9 @@ readonly locales=" C.UTF8 UTF-8 " -# We do this everywhere, so why not put it in this script -run_default_funcs +if [[ ${RUN_DEFAULT_FUNCS} != no ]] +then + update_env_settings + setup_features + show_debug +fi