From 0d994ae7b9b83f269cb90fd052a168b138cd798c Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Wed, 10 May 2017 23:24:07 +0200
Subject: [PATCH] util: fix load_profile()

---
 lib/util.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/util.sh b/lib/util.sh
index 6fe7ecb..3b11c93 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -316,16 +316,9 @@ load_config(){
 
 load_profile(){
 
-    local prof="$1"
+    local profile_conf="$1/profile.conf"
 
-    [[ -f $prof ]] || 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
+    [[ -f ${profile_conf} ]] || return 1
 
     [[ -r ${profile_conf} ]] && source ${profile_conf}
 
@@ -392,6 +385,14 @@ load_profile(){
 
     ${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
         sort -u ${run_dir}/shared/Packages-Net ${live_list} > ${tmp_dir}/packages-live-net.list
         live_list=${tmp_dir}/packages-live-net.list