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 8E16E138334 for ; Sun, 21 Jul 2019 16:26:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 699C4E086E; Sun, 21 Jul 2019 16:26:42 +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 2C78CE086E for ; Sun, 21 Jul 2019 16:26:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 88ECA3483EF for ; Sun, 21 Jul 2019 16:26:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90D2A734 for ; Sun, 21 Jul 2019 16:26:37 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1563724071.3352116b60a054823171b2cbe5cd15ee95af3d6c.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_cmdline.sh genkernel X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 3352116b60a054823171b2cbe5cd15ee95af3d6c X-VCS-Branch: master Date: Sun, 21 Jul 2019 16:26: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: c0216d06-9111-41ed-a3f6-0df525d00a6c X-Archives-Hash: b87be33b0cd82010f2e42c48fdd5085d commit: 3352116b60a054823171b2cbe5cd15ee95af3d6c Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Jul 20 21:22:24 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jul 21 15:47:51 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3352116b Use small_die() instead of gen_die() until determine_real_args() was called Signed-off-by: Thomas Deutschmann gentoo.org> gen_cmdline.sh | 3 +-- genkernel | 18 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gen_cmdline.sh b/gen_cmdline.sh index b9f1326..b17e35c 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -786,8 +786,7 @@ parse_cmdline() { exit 0 ;; *) - echo "Error: Unknown option '$*'!" - exit 1 + small_die "Unknown option '$*'!" ;; esac } diff --git a/genkernel b/genkernel index 50de3f7..dd275e2 100755 --- a/genkernel +++ b/genkernel @@ -61,15 +61,15 @@ LOGLEVEL=${LOGLEVEL:-1} source "${GK_SHARE}"/defaults/software.sh || small_die "Could not read '${GK_SHARE}/defaults/software.sh'" source "${GK_SHARE}"/defaults/config.sh || small_die "Could not read '${GK_SHARE}/defaults/config.sh'" source "${GK_SHARE}"/gen_funcs.sh || small_die "Could not read '${GK_SHARE}/gen_funcs.sh'" -source "${GK_SHARE}"/gen_cmdline.sh || gen_die "Could not read '${GK_SHARE}/gen_cmdline.sh'" -source "${GK_SHARE}"/gen_arch.sh || gen_die "Could not read '${GK_SHARE}/gen_arch.sh'" -source "${GK_SHARE}"/gen_determineargs.sh || gen_die "Could not read '${GK_SHARE}/gen_determineargs.sh'" -source "${GK_SHARE}"/gen_compile.sh || gen_die "Could not read '${GK_SHARE}/gen_compile.sh'" -source "${GK_SHARE}"/gen_configkernel.sh || gen_die "Could not read '${GK_SHARE}/gen_configkernel.sh'" -source "${GK_SHARE}"/gen_initramfs.sh || gen_die "Could not read '${GK_SHARE}/gen_initramfs.sh'" -source "${GK_SHARE}"/gen_moddeps.sh || gen_die "Could not read '${GK_SHARE}/gen_moddeps.sh'" -source "${GK_SHARE}"/gen_package.sh || gen_die "Could not read '${GK_SHARE}/gen_package.sh'" -source "${GK_SHARE}"/gen_bootloader.sh || gen_die "Could not read '${GK_SHARE}/gen_bootloader.sh'" +source "${GK_SHARE}"/gen_cmdline.sh || small_die "Could not read '${GK_SHARE}/gen_cmdline.sh'" +source "${GK_SHARE}"/gen_arch.sh || small_die "Could not read '${GK_SHARE}/gen_arch.sh'" +source "${GK_SHARE}"/gen_determineargs.sh || small_die "Could not read '${GK_SHARE}/gen_determineargs.sh'" +source "${GK_SHARE}"/gen_compile.sh || small_die "Could not read '${GK_SHARE}/gen_compile.sh'" +source "${GK_SHARE}"/gen_configkernel.sh || small_die "Could not read '${GK_SHARE}/gen_configkernel.sh'" +source "${GK_SHARE}"/gen_initramfs.sh || small_die "Could not read '${GK_SHARE}/gen_initramfs.sh'" +source "${GK_SHARE}"/gen_moddeps.sh || small_die "Could not read '${GK_SHARE}/gen_moddeps.sh'" +source "${GK_SHARE}"/gen_package.sh || small_die "Could not read '${GK_SHARE}/gen_package.sh'" +source "${GK_SHARE}"/gen_bootloader.sh || small_die "Could not read '${GK_SHARE}/gen_bootloader.sh'" export GK_MASTER_PID=${BASHPID}