root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso] rm useless code in load_pkgs()

Browse source
This commit is contained in:
udeved 2015-06-12 00:08:16 +02:00
parent 283e77971f
commit 6ed34f132f
1 changed files with 14 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/iso/util-iso.sh
View file

@ -504,22 +504,22 @@ load_pkgs(){
_purge="s|>cleanup.*||g" \ _purge="s|>cleanup.*||g" \
_purge_rm="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 case $1 in
'Packages-Xorg') '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" \ packages_cleanup=$(sed "$_com_rm" "$1" \
| grep cleanup \ | grep cleanup \
| sed "$_purge_rm" \ | sed "$_purge_rm" \
@ -527,31 +527,11 @@ load_pkgs(){
| sed "$_clean") | sed "$_clean")
;; ;;
'Packages-Lng') '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" \ packages_cleanup=$(sed "$_com_rm" "$1" \
| grep cleanup \ | grep cleanup \
| sed "$_purge_rm") | sed "$_purge_rm")
packages_lng_kde=$(sed "$_com_rm" "$1" | sed "$_clean") 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 esac
} }