rename fedora scripts, add version as argument

7 files changed, 28 insertions, 22 deletions

diff --git a/F25-efi-armv7.sh b/Fedora-efi-armv7.sh
index 7253fa8..c54bf85 100755
--- a/F25-efi-armv7.sh
+++ b/Fedora-efi-armv7.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-name="fedora-25-efi"
-repo="repos/fedora-25-armv7.repo"
+vers="${1-25}"
+name="fedora-${vers}-efi"
+repo="repos/fedora-${vers}-armv7.repo"
 rpms="grub2-efi -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
diff --git a/F25-efi-grub2.sh b/Fedora-efi-grub2.sh
index 63c37fe..63dc0d0 100755
--- a/F25-efi-grub2.sh
+++ b/Fedora-efi-grub2.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-name="fedora-25-efi-grub2"
-repo="repos/fedora-25.repo"
+vers="${1-25}"
+name="fedora-${vers}-efi-grub2"
+repo="repos/fedora-${vers}.repo"
 rpms="grub2-efi shim -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
diff --git a/F25-efi-systemd.sh b/Fedora-efi-systemd.sh
index 2f27ee2..490ee56 100755
--- a/F25-efi-systemd.sh
+++ b/Fedora-efi-systemd.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-name="fedora-25-efi-systemd"
-repo="repos/fedora-25.repo"
+vers="${1-25}"
+name="fedora-${vers}-efi-systemd"
+repo="repos/fedora-${vers}.repo"
 rpms="-grubby -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
diff --git a/F25-rpi32.sh b/Fedora-rpi32.sh
index 8b4791a..a4ac3b3 100755
--- a/F25-rpi32.sh
+++ b/Fedora-rpi32.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-name="fedora-25-rpi2"
-repo="repos/fedora-25.repo"
+vers="${1-25}"
+name="fedora-${vers}-rpi2"
+repo="repos/fedora-${vers}.repo"
 rpms="bcm283x-firmware uboot-images-armv7 extlinux-bootloader dracut-config-generic"
 krnl="kernel kernel-modules"
 
diff --git a/F25-rpi64-fedora.sh b/Fedora-rpi64-fedora.sh
index 6259f6c..e499903 100755
--- a/F25-rpi64-fedora.sh
+++ b/Fedora-rpi64-fedora.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-name="fedora-25-rpi3-fedora"
-repo="repos/fedora-25-aarch64.repo"
+vers="${1-25}"
+name="fedora-${vers}-rpi3-fedora"
+repo="repos/fedora-${vers}-aarch64.repo"
 rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
 krnl="kernel kernel-modules"
 
diff --git a/F25-rpi64-kraxel.sh b/Fedora-rpi64-kraxel.sh
index d2eccd9..0ab5e24 100755
--- a/F25-rpi64-kraxel.sh
+++ b/Fedora-rpi64-kraxel.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-name="fedora-25-rpi3-kraxel"
-repo="repos/fedora-25-aarch64.repo"
+vers="${1-25}"
+name="fedora-${vers}-rpi3-kraxel"
+repo="repos/fedora-${vers}-aarch64.repo"
 rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
 krnl="kernel-main"
 
diff --git a/run-all.sh b/run-all.sh
index b63603b..4b06e04 100755
--- a/run-all.sh
+++ b/run-all.sh
@@ -5,25 +5,25 @@ BASE="$(dirname $0)"
 case "$(hostname --short)" in
 arm-b32 | cubietruck)
 	# rebuild images
-	./F25-rpi32.sh		|| exit 1
-	./F25-efi-armv7.sh	|| exit 1
+	./Fedora-rpi32.sh		|| exit 1
+	./Fedora-efi-armv7.sh		|| exit 1
 	;;
 arm-b64)
 	# rebuild images
-	./F25-rpi64-fedora.sh	|| exit 1
-	./F25-rpi64-kraxel.sh	|| exit 1
-	./F25-efi-grub2.sh	|| exit 1
-#	./F25-efi-systemd.sh	|| exit 1
+	./Fedora-rpi64-fedora.sh	|| exit 1
+	./Fedora-rpi64-kraxel.sh	|| exit 1
+	./Fedora-efi-grub2.sh		|| exit 1
+#	./Fedora-efi-systemd.sh		|| exit 1
 	;;
 nilsson)
 	# rebuild images
 	export IMAGEFISH_DESTDIR="/vmdisk/ext/imagefish"
 	./RHEL73-efi.sh			|| exit 1
 	./CentOS7-efi.sh		|| exit 1
-	./F25-efi-grub2.sh		|| exit 1
-	./F25-efi-systemd.sh		|| exit 1
-	linux32 ./F25-efi-grub2.sh	|| exit 1
-	linux32 ./F25-efi-systemd.sh	|| exit 1
+	./Fedora-efi-grub2.sh		|| exit 1
+	./Fedora-efi-systemd.sh		|| exit 1
+	linux32 ./Fedora-efi-grub2.sh	|| exit 1
+	linux32 ./Fedora-efi-systemd.sh	|| exit 1
 	;;
 sirius)
 	# rebuild images