From 6ed34f132f1e64557055f349a6522996cbfac8bf Mon Sep 17 00:00:00 2001 From: udeved Date: Fri, 12 Jun 2015 00:08:16 +0200 Subject: [PATCH] [util-iso] rm useless code in load_pkgs() --- lib/iso/util-iso.sh | 48 +++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/lib/iso/util-iso.sh b/lib/iso/util-iso.sh index 5dc2df1..1a2ca78 100644 --- a/lib/iso/util-iso.sh +++ b/lib/iso/util-iso.sh @@ -504,22 +504,22 @@ load_pkgs(){ _purge="s|>cleanup.*||g" \ _purge_rm="s|>cleanup||g" + packages=$(sed "$_com_rm" "$1" \ + | sed "$_space" \ + | sed "$_blacklist" \ + | sed "$_purge" \ + | sed "$_init" \ + | sed "$_init_rm" \ + | sed "$_arch" \ + | sed "$_arch_rm" \ + | sed "$_nonfree" \ + | sed "$_multi" \ + | sed "$_nonfree_multi" \ + | sed "$_kernel" \ + | sed "$_clean") + case $1 in 'Packages-Xorg') - packages=$(sed "$_com_rm" "$1" \ - | sed "$_space" \ - | sed "$_blacklist" \ - | sed "$_purge" \ - | sed "$_init" \ - | sed "$_init_rm" \ - | sed "$_arch" \ - | sed "$_arch_rm" \ - | sed "$_nonfree" \ - | sed "$_multi" \ - | sed "$_nonfree_multi" \ - | sed "$_kernel" \ - | sed "$_clean") - packages_cleanup=$(sed "$_com_rm" "$1" \ | grep cleanup \ | sed "$_purge_rm" \ @@ -527,31 +527,11 @@ load_pkgs(){ | sed "$_clean") ;; 'Packages-Lng') - packages=$(sed "$_com_rm" "$1" \ - | sed "$_space" \ - | sed "$_blacklist" \ - | sed "$_arch" \ - | sed "$_arch_rm" \ - | sed "$_purge" \ - | sed "$_clean") - packages_cleanup=$(sed "$_com_rm" "$1" \ | grep cleanup \ | sed "$_purge_rm") packages_lng_kde=$(sed "$_com_rm" "$1" | sed "$_clean") ;; - *) - packages=$(sed "$_com_rm" "$1" \ - | sed "$_space" \ - | sed "$_blacklist" \ - | sed "$_kernel" \ - | sed "$_init" \ - | sed "$_init_rm" \ - | sed "$_arch" \ - | sed "$_arch_rm" \ - | sed "$_multi" \ - | sed "$_clean") - ;; esac }