From 7fdcb0fcb31b2ec891127dc7624279b09d009e81 Mon Sep 17 00:00:00 2001 From: udeved Date: Fri, 28 Apr 2017 02:39:11 +0200 Subject: [PATCH] util-pkg-chroot: shorten group loading --- lib/util-pkg-chroot.sh | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/util-pkg-chroot.sh b/lib/util-pkg-chroot.sh index 57dc1e0..a86588a 100644 --- a/lib/util-pkg-chroot.sh +++ b/lib/util-pkg-chroot.sh @@ -57,23 +57,16 @@ init_base_devel(){ local file=${DATADIR}/base-devel-udev # info "Loading custom group: %s" "$file" - - if ${is_multilib}; then - _multi="s|>multilib||g" - else - _multi="s|>multilib.*||g" - fi + _multi="s|>multilib.*||g" + ${is_multilib} && _multi="s|>multilib||g" base_packages=($(sed "$_com_rm" "$file" \ | sed "$_space" \ | sed "$_multi" \ | sed "$_clean")) else - if ${is_multilib};then - base_packages=('base-devel' 'multilib-devel') - else - base_packages=('base-devel') - fi + base_packages=('base-devel') + ${is_multilib} && base_packages+=('multilib-devel') fi }