Code cleanup

config/4MLinux/4MLinux.cfg

@@ -1,12 +1,10 @@
 # 4MLinux
 # https://4mlinux.com
 
-iso_subdir="4MLinux"
 iso_pattern1="4MLinux-*-64bit.iso"
 iso_pattern2="4MServer-*-64bit.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_subdir/$iso_pattern1 $iso_dir/$iso_pattern2 $iso_dir/$iso_subdir/$iso_pattern2; do
+for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -20,7 +18,7 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_subdir/$iso_pattern1 $iso_di
 
 			menuentry "Start 4MLinux" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg
+				linux $linux_path $isocfg $bootoptions
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/Acronis_True_Image/Acronis_True_Image.cfg

@@ -1,10 +1,9 @@
 # Acronis True Image
 # https://www.acronis.com
 
-iso_subdir="true-image"
 iso_pattern="AcronisBootableMedia*.iso"
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern ; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -29,7 +28,7 @@ for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern ; do
 				linux (loop)/dat2.dat force_modules=usbhid quiet
 				echo Loading initrd...
 				initrd (loop)/dat3.dat (loop)/dat4.dat
-			}		
+			}
 			menuentry "Acronis System Report (32-bit)" {
 				echo Loading kernel...
 				linux (loop)/dat6.dat product=system_report force_modules=usbhid quiet

config/AntivirusLiveCD/AntivirusLiveCD.cfg

@@ -2,11 +2,9 @@
 # https://antiviruslivecd.4mlinux.com
 # https://sourceforge.net/projects/antiviruslivecd
 
-iso_subdir="AntivirusLiveCD"
 iso_pattern="AntivirusLiveCD-*.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -20,7 +18,7 @@ for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
 
 			menuentry "Start AntivirusLiveCD" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg
+				linux $linux_path $isocfg $bootoptions
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/Archman/Archman.cfg

@@ -1,11 +1,9 @@
 # Archman GNU/Linux
 # https://archman.org
 
-iso_subdir="Archman"
 iso_pattern="Archman-*-x86_64.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -21,14 +19,14 @@ for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
 			menuentry "Archman GNU/Linux x86_64" {
 
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau
+				linux $linux_path $isocfg $bootoptions i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Archman GNU/Linux x86_64 ( NVIDIA NONFREE NEW CARDS NON HYBRID )" {
 
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
+				linux $linux_path $isocfg $bootoptions nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/CentOS/CentOS.cfg

@@ -1,43 +1,41 @@
 # For CentOS Linux and CentOS Stream - DVD and net-install (boot)
 
-iso_subdir="CentOS"
 iso_pattern="CentOS-*-x86_64-*.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern ; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
 			loopback loop $iso_path
-			probe --label --set=cd_label (loop)			
+			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="inst.stage2=hd:LABEL=$cd_label quiet"
 			linux_path="(loop)/images/pxeboot/vmlinuz"
 			initrd_path="(loop)/images/pxeboot/initrd.img"
 
 			menuentry "Install CentOS Linux" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg
+				linux $linux_path $isocfg $bootoptions
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Test this media & install CentOS Linux" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg rd.live.check
+				linux $linux_path $isocfg $bootoptions rd.live.check
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Install CentOS Linux in basic graphics mode" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nomodeset
+				linux $linux_path $isocfg $bootoptions nomodeset
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Rescue a CentOS Linux system" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg rescue
+				linux $linux_path $isocfg $bootoptions rescue
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/EndeavourOS/EndeavourOS.cfg

@@ -1,11 +1,9 @@
 # EndeavourOS
 # https://endeavouros.com
 
-iso_subdir="endeavouros"
 iso_pattern="endeavouros-*-x86_64.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -21,14 +19,14 @@ for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
 			menuentry "Boot EndeavourOS" {
 
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia
+				linux $linux_path $isocfg $bootoptions nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Boot EndeavourOS Nvidia NonFree new cards non hybrid" {
 
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
+				linux $linux_path $isocfg $bootoptions nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/Gentoo/Gentoo.cfg

@@ -1,11 +1,9 @@
 # For Gentoo
 
-iso_subdir="gentoo"
 iso_pattern1="admincd-amd64-*.iso"
 iso_pattern2="install-amd64-minimal-*.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_subdir/$iso_pattern1 $iso_dir/$iso_pattern2 $iso_dir/$iso_subdir/$iso_pattern2; do
+for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -20,13 +18,13 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_subdir/$iso_pattern1 $iso_di
 
 			menuentry "Boot LiveCD" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg
+				linux $linux_path $isocfg $bootoptions
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Boot LiveCD (cached)" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg docache
+				linux $linux_path $isocfg $bootoptions docache
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/KDE_neon/neon-user.cfg

@@ -1,11 +1,9 @@
 # KDE neon
 # https://neon.kde.org
 
-iso_subdir="KDE_neon"
 iso_pattern="neon-user-*.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -19,25 +17,25 @@ for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
 
 			menuentry "Start KDE neon" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg ---
+				linux $linux_path $isocfg $bootoptions ---
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Start KDE neon (safe graphics)" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nomodeset  ---
+				linux $linux_path $isocfg $bootoptions nomodeset  ---
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Start KDE neon (OEM mode - for manufacturers)" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg --- oem-config/enable=true
+				linux $linux_path $isocfg $bootoptions --- oem-config/enable=true
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Start KDE neon (OEM mode + safe graphics)" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nomodeset --- oem-config/enable=true
+				linux $linux_path $isocfg $bootoptions nomodeset --- oem-config/enable=true
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/KaOS/KaOS.cfg

@@ -1,11 +1,9 @@
 # KaOS
 # https://kaosx.us
 
-iso_subdir="KaOS"
 iso_pattern="KaOS-*-x86_64.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -21,14 +19,14 @@ for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
 			menuentry "KaOS" {
 
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nonfree=no
+				linux $linux_path $isocfg $bootoptions nonfree=no
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "KaOS (nonfree Nvidia)" {
 
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg nonfree=yes
+				linux $linux_path $isocfg $bootoptions nonfree=yes
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/Linuxfx/Linuxfx.cfg

@@ -1,24 +1,23 @@
 # For Linuxfx
 # https://www.windowsfx.org/
 
-iso_subdir="Linuxfx"
 iso_pattern="linuxfx*.iso"
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path		
+			loopback loop $iso_path
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="boot=casper quiet splash"
 			linux_path="(loop)/casper/vmlinuz"
 			initrd_path="(loop)/casper/initrd.lz"
 
 			menuentry "Start Linuxfx" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg
+				linux $linux_path $isocfg $bootoptions
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/Mageia/Mageia_netinstall.cfg

@@ -1,9 +1,8 @@
 # For Mageia netinstall
 
-iso_subdir="Mageia"
 iso_pattern="Mageia-*-netinstall-*x86_64.iso"
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
@@ -17,13 +16,13 @@ for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
 
 			menuentry "Start Mageia Install" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg quiet noiswmd
+				linux $linux_path $isocfg $bootoptions quiet noiswmd
 				echo Loading initrd...
 				initrd $initrd_path
 			}
 			menuentry "Start Mageia Rescue" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg noiswmd rescue
+				linux $linux_path $isocfg $bootoptions noiswmd rescue
 				echo Loading initrd...
 				initrd $initrd_path
 			}

config/Solus/Solus.cfg

@@ -1,25 +1,23 @@
 # For Solus
 
-iso_subdir="Solus"
 iso_pattern="Solus-*.iso"
-grub_configfile=""
 
-for isofile in $iso_dir/$iso_pattern $iso_dir/$iso_subdir/$iso_pattern; do
+for isofile in $iso_dir/$iso_pattern; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
 			loopback loop $iso_path
-			probe --label --set=cd_label (loop)			
+			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="root=live:CDLABEL=$cd_label ro rd.luks=0 rd.md=0 rd.live.overlay.overlayfs=1 quiet splash"
 			linux_path="(loop)/boot/kernel"
 			initrd_path="(loop)/boot/initrd.img"
 
 			menuentry "Start Solus" {
 				echo Loading kernel...
-				linux $linux_path $bootoptions $isocfg
+				linux $linux_path $isocfg $bootoptions
 				echo Loading initrd...
 				initrd $initrd_path
 			}