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

[util-iso] add 2 new pkg loaders; don't use it for now

Browse source
This commit is contained in:
udeved 2015-06-09 17:18:08 +02:00
parent 0a0cf4f088
commit ca233c6bc8
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/util-iso.sh
View file

@ -459,6 +459,22 @@ load_pkgs(){
fi
}
# $1: file name
load_pkgs_new(){
msg3 "Loading Packages: [$1] ..."
local exp
if [[ ${initsys} == 'openrc' ]];then
exp="s|>openrc||g"
else
exp="s|>systemd||g"
fi
if [[ "${arch}" == "i686" ]]; then
packages=$(sed "s|#.*||g" "$1" | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "$exp" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
elif [[ "${arch}" == "x86_64" ]]; then
packages=$(sed "s|#.*||g" "$1" | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "$exp" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
fi
}
load_pkgs_xorg(){
msg3 "Loading Packages: [Packages-Xorg] ..."
if [[ "${arch}" == "i686" ]]; then
@ -469,6 +485,27 @@ load_pkgs_xorg(){
packages_xorg_cleanup=$(sed "s|#.*||g" Packages-Xorg | grep cleanup | sed "s|>cleanup||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
}
load_pkgs_xorg_new(){
msg3 "Loading Packages: [Packages-Xorg] ..."
local exp
if [[ ${initsys} == 'openrc' ]];then
exp="s|>openrc||g"
else
exp="s|>systemd||g"
fi
if [[ "${arch}" == "i686" ]]; then
packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "$exp" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|>free_x64.*||g" | sed "s|>free_uni||g" | sed "s|>nonfree_x64.*||g" | sed "s|>nonfree_uni||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
elif [[ "${arch}" == "x86_64" ]]; then
if ${multilib};then
local exp2="s|>nonfree_multilib||g" exp3="s|>multilib||g"
packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "$exp" | sed "$exp2" | sed "$exp3" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|>free_x64||g" | sed "s|>free_uni||g" | sed "s|>nonfree_uni||g" | sed "s|>nonfree_x64||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
else
packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "$exp" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|>free_x64||g" | sed "s|>free_uni||g" | sed "s|>nonfree_uni||g" | sed "s|>nonfree_x64||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
fi
fi
packages_xorg_cleanup=$(sed "s|#.*||g" Packages-Xorg | grep cleanup | sed "s|>cleanup||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
}
load_pkgs_lng(){
msg3 "Loading Packages: [Packages-Lng] ..."
if [[ "${arch}" == "i686" ]]; then