From e0ebb5ca341662f691c5e005263503ff249f8903 Mon Sep 17 00:00:00 2001 From: udeved Date: Sat, 10 Jun 2017 18:17:58 +0200 Subject: [PATCH] util-profile: make it possible to have a profile without shared folder --- lib/util-profile.sh | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/util-profile.sh b/lib/util-profile.sh index 1c14816..009bee6 100644 --- a/lib/util-profile.sh +++ b/lib/util-profile.sh @@ -87,27 +87,22 @@ load_profile(){ ${extra} && basic='false' root_list=${run_dir}/shared/Packages-Root + [[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root" + root_overlay="${run_dir}/shared/${os_id}/root-overlay" - if [[ -e "$profdir/root-overlay" ]];then - root_overlay="$profdir/root-overlay" - fi + [[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay" mhwd_list=${run_dir}/shared/Packages-Mhwd + [[ -f "$profdir/Packages-Mhwd" ]] && mhwd_list="$profdir/Packages-Mhwd" - desktop_list=$profdir/Packages-Desktop - if [[ -e "$profdir/desktop-overlay" ]];then - desktop_overlay="$profdir/desktop-overlay" - fi + [[ -f "$profdir/Packages-Desktop" ]] && desktop_list=$profdir/Packages-Desktop + [[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay" live_list="${run_dir}/shared/Packages-Live" - if [[ -f "$profdir/Packages-Live" ]];then - live_list="$profdir/Packages-Live" - fi + [[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live" live_overlay="${run_dir}/shared/${os_id}/live-overlay" - if [[ -e "$profdir/live-overlay" ]];then - live_overlay="$profdir/live-overlay" - fi + [[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay" if ${netinstall};then sort -u ${run_dir}/shared/Packages-Net ${live_list} > ${tmp_dir}/packages-live-net.list