simplify things a bit

2 files changed, 8 insertions, 8 deletions

diff --git a/iso32 b/iso32
index 45d2b38..8c83afc 100755
--- a/iso32
+++ b/iso32
@@ -7,15 +7,15 @@ checkroot
 
 export local mainarch="x86"
 export local isoname=""$releasename"-"$releaseversion"-"$mainarch""
+export local livedir=""$isoname"/livecd"
+export local isoboot=""$livedir"/boot/grub"
 export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver""
 export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver""
 
 makeisox86 () {
 	# ISO layout
 	mkdir -p "$coremnt"
-	mkdir -p ""$isoname"/livecd"
-	mkdir -p ""$isoname"/boot"
-	mkdir -p ""$isoname"/boot/grub"
+	mkdir -p "$isoboot"
 	# Mount && Sync squashed core (Kogaion stage4) into live environment
 	mount -t squashfs "$chrootx86" "$coremnt"
 	rsync -aHAXr --progress "$coremnt/" ""$isoname"/livecd/"
diff --git a/iso64 b/iso64
index 38af6d2..30cfb04 100755
--- a/iso64
+++ b/iso64
@@ -7,17 +7,17 @@ checkroot
 
 export local mainarch="x86_64"
 export local isoname=""$releasename"-"$releaseversion"-"$mainarch""
+export local livedir=""$isoname"/livecd"
+export local isoboot=""$livedir"/boot/grub"
+export local isoefiboot=""$livedir"/efi/boot"
 export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver""
 export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver""
 
 makeisox64 () {
 	# ISO layout
 	mkdir -p "$coremnt"
-	mkdir -p ""$isoname"/livecd"
-	mkdir -p ""$isoname"/boot"
-	mkdir -p ""$isoname"/boot/grub"
-	mkdir -p ""$isoname"/efi"
-	mkdir -p ""$isoname"/efi/boot"
+	mkdir -p "$isoboot"
+	mkdir -p "$isoefiboot"
 	# Mount && Sync squashed core (Kogaion stage4) into live environment
 	mount -t squashfs "$chrootx64" "$coremnt"
 	rsync -aHAXr --progress "$coremnt/" ""$isoname"/livecd/"