From 6a20507f950483f2adc68bab42a22bf5e7e8c683 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Wed, 1 Jul 2020 21:49:04 +0800
Subject: replace "$ISOPATH/$ISOFILE" with "${ISO_FILEPATH}" in install_live

This is for metaiso install script in the future.
---
 buildlive                              | 1 +
 distro/antix/32/install.sh             | 2 +-
 distro/centos/install.sh               | 2 +-
 distro/debian/64/install.sh            | 2 +-
 distro/deepin/install.sh               | 2 +-
 distro/grml/64/install.sh              | 2 +-
 distro/kali/install.sh                 | 2 +-
 distro/manjaro/install.sh              | 2 +-
 distro/mint/lmde/install.sh            | 2 +-
 distro/mx/install.sh                   | 2 +-
 distro/opensuse/install.sh             | 2 +-
 distro/trisquel/8.0/64/mini/install.sh | 2 +-
 distro/ubuntu/14.04/install.sh         | 2 +-
 distro/ubuntu/install.sh               | 2 +-
 functions.sh                           | 6 +++---
 15 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/buildlive b/buildlive
index f7d5862..ad607cb 100755
--- a/buildlive
+++ b/buildlive
@@ -197,6 +197,7 @@ do
 	ISOFILE="${ISOLIST[$i-1]}"
 	ISONAME="${ISONAMELIST[$i-1]}"
 	DISTRO="${DISTROLIST[$i-1]}"
+	ISO_FILEPATH="$ISOPATH/$ISOFILE"
 
 	set_distro "$DISTRO"
 	export DISTRONAME KEYWORD # for grub and syslinux generation
diff --git a/distro/antix/32/install.sh b/distro/antix/32/install.sh
index f5efb54..e45fb9e 100644
--- a/distro/antix/32/install.sh
+++ b/distro/antix/32/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/antix/32" "$DATADIR/antix"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/antix/"
+	cp "${ISO_FILEPATH}" "$DATADIR/antix/"
 	mount_iso
 	cp "$ISOMNT/antiX/vmlinuz" "$ISOMNT/antiX/initrd.gz" "$KERNELDIR/antix/32/"
 	umount_iso
diff --git a/distro/centos/install.sh b/distro/centos/install.sh
index 6b6d88c..fd42abf 100644
--- a/distro/centos/install.sh
+++ b/distro/centos/install.sh
@@ -1,7 +1,7 @@
 install_live() {
 	mount_iso
 	install -d "$DATADIR/centos/" "$KERNELDIR/centos/$version"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/centos/"
+	cp "${ISO_FILEPATH}" "$DATADIR/centos/"
 	cp "$ISOMNT/images/pxeboot/vmlinuz" "$ISOMNT/images/pxeboot/initrd.img" "$KERNELDIR/centos/$version"
 	umount_iso
 }
diff --git a/distro/debian/64/install.sh b/distro/debian/64/install.sh
index b563e19..5a1df2c 100644
--- a/distro/debian/64/install.sh
+++ b/distro/debian/64/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/debian/64" "$DATADIR/debian"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/debian/"
+	cp "${ISO_FILEPATH}" "$DATADIR/debian/"
 	mount_iso
 	cp "$ISOMNT/live/vmlinuz"* "$ISOMNT/live/initrd.img"* "$KERNELDIR/debian/64/"
 	umount_iso
diff --git a/distro/deepin/install.sh b/distro/deepin/install.sh
index a88f8f4..a7238a2 100644
--- a/distro/deepin/install.sh
+++ b/distro/deepin/install.sh
@@ -1,7 +1,7 @@
 install_live() {
 	mount_iso
 	install -d "$DATADIR/$KEYWORD" "$KERNELDIR/$KEYWORD"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/$KEYWORD/"
+	cp "${ISO_FILEPATH}" "$DATADIR/$KEYWORD/"
 	cp "$ISOMNT/live/"{vmlinuz,initrd.lz} "$KERNELDIR/$KEYWORD/"
 	umount_iso
 }
diff --git a/distro/grml/64/install.sh b/distro/grml/64/install.sh
index feb6ad2..08a4853 100644
--- a/distro/grml/64/install.sh
+++ b/distro/grml/64/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/grml/64" "$DATADIR/grml"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/grml/"
+	cp "${ISO_FILEPATH}" "$DATADIR/grml/"
 	mount_iso
 	cp "$ISOMNT/boot/grml64full/vmlinuz" "$ISOMNT/boot/grml64full/initrd.img" "$KERNELDIR/grml/64/"
 	umount_iso
diff --git a/distro/kali/install.sh b/distro/kali/install.sh
index 6ff415c..354a0a3 100644
--- a/distro/kali/install.sh
+++ b/distro/kali/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/kali/64" "$DATADIR/kali"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/kali/"
+	cp "${ISO_FILEPATH}" "$DATADIR/kali/"
 	mount_iso
 	cp "$ISOMNT/live/vmlinuz" "$ISOMNT/live/initrd.img" "$KERNELDIR/kali/64/"
 	umount_iso
diff --git a/distro/manjaro/install.sh b/distro/manjaro/install.sh
index 4e64fc7..cb9ecf6 100644
--- a/distro/manjaro/install.sh
+++ b/distro/manjaro/install.sh
@@ -4,6 +4,6 @@ install_live() {
 	cp "$ISOMNT/boot/vmlinuz-$ARCH" "$ISOMNT/boot/initramfs-$ARCH.img" "$ISOMNT/boot/intel_ucode.img" \
 	       	"$KERNELDIR/manjaro"
 	umount_iso
-        cp "$ISOPATH/$ISOFILE" "$DATADIR/manjaro/"
+	cp "${ISO_FILEPATH}" "$DATADIR/manjaro/"
 }
 
diff --git a/distro/mint/lmde/install.sh b/distro/mint/lmde/install.sh
index eb08326..36fdb13 100644
--- a/distro/mint/lmde/install.sh
+++ b/distro/mint/lmde/install.sh
@@ -2,6 +2,6 @@ install_live() {
 	install -d "$KERNELDIR/mint/lmde/64" "$DATADIR/mint"
 	mount_iso
 	cp "$ISOMNT/live/vmlinuz" "$ISOMNT/live/initrd.lz" "$KERNELDIR/mint/lmde/64/"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/mint/"
+	cp "${ISO_FILEPATH}" "$DATADIR/mint/"
 	umount_iso
 }
diff --git a/distro/mx/install.sh b/distro/mx/install.sh
index 87a782f..a147752 100644
--- a/distro/mx/install.sh
+++ b/distro/mx/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/$KEYWORD/$BITS" "$DATADIR/$KEYWORD"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/$KEYWORD/"
+	cp "${ISO_FILEPATH}" "$DATADIR/$KEYWORD/"
 	mount_iso
 	cp "$ISOMNT/antiX/vmlinuz" "$ISOMNT/antiX/initrd.gz" \
 		"$KERNELDIR/$KEYWORD/$BITS/"
diff --git a/distro/opensuse/install.sh b/distro/opensuse/install.sh
index d24c9db..ca7f67b 100644
--- a/distro/opensuse/install.sh
+++ b/distro/opensuse/install.sh
@@ -4,5 +4,5 @@ install_live() {
 	cp "$ISOMNT/boot/x86_64/loader"/{linux,initrd} \
 		"$KERNELDIR/opensuse/$version"
 	umount_iso
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/opensuse/"
+	cp "${ISO_FILEPATH}" "$DATADIR/opensuse/"
 }
diff --git a/distro/trisquel/8.0/64/mini/install.sh b/distro/trisquel/8.0/64/mini/install.sh
index 72d4f80..7a87dc1 100644
--- a/distro/trisquel/8.0/64/mini/install.sh
+++ b/distro/trisquel/8.0/64/mini/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/trisquel/64" "$DATADIR/trisquel"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/trisquel/"
+	cp "${ISO_FILEPATH}" "$DATADIR/trisquel/"
 	mount_iso
 	cp "$ISOMNT/casper/vmlinuz" "$ISOMNT/casper/initrd" "$KERNELDIR/trisquel/64/"
 	umount_iso
diff --git a/distro/ubuntu/14.04/install.sh b/distro/ubuntu/14.04/install.sh
index 24ce8f9..b262a1f 100644
--- a/distro/ubuntu/14.04/install.sh
+++ b/distro/ubuntu/14.04/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/ubuntu/14.04/64" "$DATADIR/ubuntu"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/ubuntu/"
+	cp "${ISO_FILEPATH}" "$DATADIR/ubuntu/"
 	mount_iso
 	cp "$ISOMNT/casper/vmlinuz.efi" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/ubuntu/14.04/64/"
 	umount_iso
diff --git a/distro/ubuntu/install.sh b/distro/ubuntu/install.sh
index 20b8d3f..cbb7194 100644
--- a/distro/ubuntu/install.sh
+++ b/distro/ubuntu/install.sh
@@ -1,6 +1,6 @@
 install_live() {
 	install -d "$KERNELDIR/${KEYWORD}/${_ver}/64" "$DATADIR/${KEYWORD}"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/${KEYWORD}/"
+	cp "${ISO_FILEPATH}" "$DATADIR/${KEYWORD}/"
 	mount_iso
 	cp "$ISOMNT/casper/${VMLINUZ}" "$ISOMNT/casper/${INITRD}" "$KERNELDIR/${KEYWORD}/${_ver}/64/"
 	umount_iso
diff --git a/functions.sh b/functions.sh
index c83d1d8..aae9089 100644
--- a/functions.sh
+++ b/functions.sh
@@ -110,15 +110,15 @@ download_iso() {
 }
 
 mount_iso() {
-	LOOPDEV=$(/sbin/losetup -n -O NAME -j "$ISOPATH/$ISOFILE")
+	LOOPDEV=$(/sbin/losetup -n -O NAME -j "${ISO_FILEPATH}")
 	if [[ -n "$LOOPDEV" ]]
 	then
 		ISOMNT="$LOOPDEV"
 		umount_iso
 	fi
 
-	udevil mount "$ISOPATH/$ISOFILE"
-	LOOPDEV=$(/sbin/losetup -n -O NAME -j "$ISOPATH/$ISOFILE")
+	udevil mount "${ISO_FILEPATH}"
+	LOOPDEV=$(/sbin/losetup -n -O NAME -j "${ISO_FILEPATH}")
 	if [[ -n "$LOOPDEV" ]]
 	then
 		ISOMNT=$(findmnt -n -o TARGET "$LOOPDEV")
-- 
cgit v1.2.3