forked from mirrored-repos/manjaro-tools
util: fix load_profile()
This commit is contained in:
parent
ebdcecf9d1
commit
0d994ae7b9
1 changed files with 10 additions and 9 deletions
19
lib/util.sh
19
lib/util.sh
|
@ -316,16 +316,9 @@ load_config(){
|
||||||
|
|
||||||
load_profile(){
|
load_profile(){
|
||||||
|
|
||||||
local prof="$1"
|
local profile_conf="$1/profile.conf"
|
||||||
|
|
||||||
[[ -f $prof ]] || return 1
|
[[ -f ${profile_conf} ]] || return 1
|
||||||
|
|
||||||
profile_conf="$prof/profile.conf"
|
|
||||||
|
|
||||||
root_list=$prof/Packages-Root
|
|
||||||
mhwd_list=${run_dir}/shared/Packages-Mhwd
|
|
||||||
desktop_list=$prof/Packages-Desktop
|
|
||||||
live_list=$prof/Packages-Live
|
|
||||||
|
|
||||||
[[ -r ${profile_conf} ]] && source ${profile_conf}
|
[[ -r ${profile_conf} ]] && source ${profile_conf}
|
||||||
|
|
||||||
|
@ -392,6 +385,14 @@ load_profile(){
|
||||||
|
|
||||||
${extra} && basic='false'
|
${extra} && basic='false'
|
||||||
|
|
||||||
|
root_list=${profile_conf}/Packages-Root
|
||||||
|
|
||||||
|
mhwd_list=${run_dir}/shared/Packages-Mhwd
|
||||||
|
|
||||||
|
desktop_list=${profile_conf}/Packages-Desktop
|
||||||
|
|
||||||
|
live_list=${profile_conf}/Packages-Live
|
||||||
|
|
||||||
if ${netinstall};then
|
if ${netinstall};then
|
||||||
sort -u ${run_dir}/shared/Packages-Net ${live_list} > ${tmp_dir}/packages-live-net.list
|
sort -u ${run_dir}/shared/Packages-Net ${live_list} > ${tmp_dir}/packages-live-net.list
|
||||||
live_list=${tmp_dir}/packages-live-net.list
|
live_list=${tmp_dir}/packages-live-net.list
|
||||||
|
|
Loading…
Reference in a new issue