[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3352116b60a054823171b2cbe5cd15ee95af3d6c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:22:24 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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}