From 7725b19c2feb5f4bc69aabe76f8aa3b7e6edcc0b Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Fri, 20 Nov 2015 22:38:16 +0100
Subject: [PATCH] [util*] revert central cache_tree path; needs too much
 changes atm

---
 lib/util-iso.sh     | 1 +
 lib/util-publish.sh | 1 +
 lib/util.sh         | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index e810b50..d9a4153 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -615,6 +615,7 @@ load_profile(){
 	[[ -d ${work_dir}/root-image ]] && check_chroot_version "${work_dir}/root-image"
 
 	eval_edition "$1"
+	local cache_tree=iso/${iso_edition}/${dist_release}
 	cache_dir_iso="${cache_dir}/${cache_tree}/$1"
 	prepare_dir "${cache_dir_iso}"
 }
diff --git a/lib/util-publish.sh b/lib/util-publish.sh
index c342d61..a0ec2ca 100644
--- a/lib/util-publish.sh
+++ b/lib/util-publish.sh
@@ -25,6 +25,7 @@ sync_dir(){
 }
 
 set_src_dir(){
+	cache_tree=iso/${iso_edition}/${dist_release}
         src_dir=${cache_dir}/${cache_tree}/$1
 }
 
diff --git a/lib/util.sh b/lib/util.sh
index 6837aca..0795e0c 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -427,8 +427,6 @@ init_buildiso(){
 	[[ -z ${use_overlayfs} ]] && use_overlayfs='true'
 	used_kernel=$(uname -r | cut -d . -f1)
 	[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
-
-	cache_tree=iso/${iso_edition}/${dist_release}
 }
 
 init_deployiso(){