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

util: fix load_profile()

Browse source
This commit is contained in:
udeved 2017-05-10 23:31:51 +02:00
parent 0d994ae7b9
commit 33d311cee6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/util.sh
View file

@ -315,8 +315,8 @@ load_config(){
} }
load_profile(){ load_profile(){
local profdir="$1"
local profile_conf="$1/profile.conf" local profile_conf="$profdir/profile.conf"
[[ -f ${profile_conf} ]] || return 1 [[ -f ${profile_conf} ]] || return 1
@ -385,13 +385,13 @@ load_profile(){
${extra} && basic='false' ${extra} && basic='false'
root_list=${profile_conf}/Packages-Root root_list=$profdir/Packages-Root
mhwd_list=${run_dir}/shared/Packages-Mhwd mhwd_list=${run_dir}/shared/Packages-Mhwd
desktop_list=${profile_conf}/Packages-Desktop desktop_list=$profdir/Packages-Desktop
live_list=${profile_conf}/Packages-Live live_list=$profdir/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