add IMAGEFISH_DESTDIR

8 files changed, 24 insertions, 18 deletions

diff --git a/F25-efi-armv7.sh b/F25-efi-armv7.sh
index 6bcee54..a19b1b1 100755
--- a/F25-efi-armv7.sh
+++ b/F25-efi-armv7.sh
@@ -5,8 +5,8 @@ repo="repos/fedora-25-armv7.repo"
 rpms="grub2-efi"
 
 arch="$(uname -m)"
-tar="${name}-${arch}.tar.gz"
-img="${name}-${arch}.qcow2"
+tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
+img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
 
 echo ""
 echo "###"
diff --git a/F25-efi-grub2.sh b/F25-efi-grub2.sh
index 6fff66e..8d1b802 100755
--- a/F25-efi-grub2.sh
+++ b/F25-efi-grub2.sh
@@ -5,8 +5,8 @@ repo="repos/fedora-25.repo"
 rpms="grub2-efi shim -dracut-config-rescue"
 
 arch="$(uname -m)"
-tar="${name}-${arch}.tar.gz"
-img="${name}-${arch}.qcow2"
+tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
+img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
 
 echo ""
 echo "###"
diff --git a/F25-rpi32.sh b/F25-rpi32.sh
index 0ce85df..8b4791a 100755
--- a/F25-rpi32.sh
+++ b/F25-rpi32.sh
@@ -6,8 +6,8 @@ rpms="bcm283x-firmware uboot-images-armv7 extlinux-bootloader dracut-config-gene
 krnl="kernel kernel-modules"
 
 arch="$(uname -m)"
-tar="${name}-${arch}.tar.gz"
-img="${name}-${arch}.raw"
+tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
+img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
 
 echo ""
 echo "###"
diff --git a/F25-rpi64-fedora.sh b/F25-rpi64-fedora.sh
index b56ec93..6259f6c 100755
--- a/F25-rpi64-fedora.sh
+++ b/F25-rpi64-fedora.sh
@@ -6,8 +6,8 @@ rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-gene
 krnl="kernel kernel-modules"
 
 arch="$(uname -m)"
-tar="${name}-${arch}.tar.gz"
-img="${name}-${arch}.raw"
+tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
+img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
 
 echo ""
 echo "###"
diff --git a/F25-rpi64-kraxel.sh b/F25-rpi64-kraxel.sh
index a184512..d2eccd9 100755
--- a/F25-rpi64-kraxel.sh
+++ b/F25-rpi64-kraxel.sh
@@ -6,8 +6,8 @@ rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-gene
 krnl="kernel-main"
 
 arch="$(uname -m)"
-tar="${name}-${arch}.tar.gz"
-img="${name}-${arch}.raw"
+tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
+img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
 
 echo ""
 echo "###"
diff --git a/RHEL73-efi.sh b/RHEL73-efi.sh
index 376b96d..bb13341 100755
--- a/RHEL73-efi.sh
+++ b/RHEL73-efi.sh
@@ -5,8 +5,8 @@ repo="repos/rhel-73.repo"
 rpms="grub2-efi shim -dracut-config-rescue"
 
 arch="$(uname -m)"
-tar="${name}-${arch}.tar.gz"
-img="${name}-${arch}.qcow2"
+tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
+img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
 
 echo ""
 echo "###"
diff --git a/push-images.sh b/push-images.sh
index 931b5ee..faf8c8f 100755
--- a/push-images.sh
+++ b/push-images.sh
@@ -3,16 +3,21 @@
 if test -d "$HOME/repo/images-testing"; then
 	echo
 	echo "# rsync uncompressed images"
-	rsync --verbose --progress \
-		*.raw *.qcow2 $HOME/repo/images-testing
+	rsync --verbose --progress		\
+		${IMAGEFISH_DESTDIR-.}/*.raw	\
+		${IMAGEFISH_DESTDIR-.}/*.qcow2	\
+		$HOME/repo/images-testing
 
 	echo
 	echo "# compress images"
-	rm -f *.xz
-	xz --verbose --keep *.raw *.qcow2
+	rm -f ${IMAGEFISH_DESTDIR-.}/*.xz
+	xz --verbose --keep			\
+		${IMAGEFISH_DESTDIR-.}/*.raw	\
+		${IMAGEFISH_DESTDIR-.}/*.qcow2
 
 	echo
 	echo "# rsync compressed images"
-	rsync --verbose --progress \
-		*.xz $HOME/repo/images-testing
+	rsync --verbose --progress		\
+		${IMAGEFISH_DESTDIR-.}/*.xz	\
+		$HOME/repo/images-testing
 fi
diff --git a/run-all.sh b/run-all.sh
index 0ad3934..a020b8b 100755
--- a/run-all.sh
+++ b/run-all.sh
@@ -21,6 +21,7 @@ arm-b64)
 	;;
 nilsson)
 	# rebuild images
+	export IMAGEFISH_DESTDIR="/vmdisk/ext/imagefish"
 	./RHEL73-efi.sh		|| exit 1
 	./F25-efi-grub2.sh	|| exit 1
 	./F25-efi-systemd.sh	|| exit 1