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 5982113835C for ; Wed, 21 Oct 2020 17:58:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D95DE098E; Wed, 21 Oct 2020 17:58:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 6E3F7E0986 for ; Wed, 21 Oct 2020 17:58:51 +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 8FCB0340D5A for ; Wed, 21 Oct 2020 17:58:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26EED3BC for ; Wed, 21 Oct 2020 17:58:48 +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: <1603177803.d59b71937aad3de9a855562736a25de7f522cf4b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master 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: d59b71937aad3de9a855562736a25de7f522cf4b X-VCS-Branch: master Date: Wed, 21 Oct 2020 17:58:48 +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: fb909323-b491-41ff-8f19-b18cd1aa93c9 X-Archives-Hash: 7f38f0e3b4336e9bd3c96fdffa61aef5 Message-ID: <20201021175848.rzurlxl0tWJBNIBBDJkIIGGUi3klxqqlIcnrC0cX91w@z> commit: d59b71937aad3de9a855562736a25de7f522cf4b Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 22:42:13 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 07:10:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d59b7193 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