build/boot/roms: reduced code indentation

resources/scripts/build/boot/roms

@@ -36,7 +36,11 @@ firstoption="${1}"
 
 main()
 {
-	if [ $# -gt 0 ]; then
+	if [ $# -lt 1 ]; then
+		usage
+		exit 1
+	fi
+
 	if [ "${firstoption}" = "help" ]; then
 		usage
 		exit 0
@@ -80,10 +84,6 @@ main()
 					|| die "build/roms: error"
 		done
 	fi
-	else
-		usage
-		exit 1
-	fi
 
 	printf "\n\nDone! Your ROMs are in bin/\n\n"
 }

resources/scripts/build/boot/roms_helper

@@ -180,7 +180,10 @@ load_config()
 load_config_overrides()
 {
 	# Override all payload directives with cmdline args
-	if [ ! -z ${payloads} ]; then	
+	if [ -z ${payloads} ]; then
+		return 0
+	fi
+
 	echo "setting payloads $payloads"
 	payload_grub="n"
 	payload_grub_withseabios="n" # seabios chainloaded from grub
@@ -192,7 +195,6 @@ load_config_overrides()
 	for payload in ${payloads} ; do
 		eval "payload_${payload}=y"
 	done
-	fi 
 }
 
 die_if_cbconfig_and_nopayload()
@@ -201,8 +203,12 @@ die_if_cbconfig_and_nopayload()
 	# defined in the lbmk config, exit with error
 	# if no configs exist, this won't fail. this way, cbtrees
 	# like "default" can exist which just contain patches
-	if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] \
-				&& [ "${payload_uboot}" != "y" ]; then
+
+	if [ "${payload_grub}" = "y" ] || [ "${payload_seabios}" = "y" ] \
+				|| [ "${payload_uboot}" = "y" ]; then
+		return 0
+	fi
+
 	for configfile in "${boardcfgdir}/config/"*; do
 		if [ ! -e "${configfile}" ]; then
 			continue
@@ -211,7 +217,6 @@ die_if_cbconfig_and_nopayload()
 				${board}
 		exit 1
 	done
-	fi
 }
 
 build_dependencies()
@@ -282,18 +287,19 @@ build_dependency_seabios()
 			./build payload seabios
 		fi
 	fi
-	if [ "${payload_memtest}" = "y" ]; then
-		if [ ! -f "memtest86plus/memtest" ]; then
+	if [ "${payload_memtest}" = "y" ] && [ ! -f "memtest86plus/memtest" ]
+	then
 		./build module memtest86plus
 	fi
-	fi
 }
 
 build_dependency_grub()
 {
-	if [ "${payload_grub}" = "y" ] \
-				|| [ "${payload_seabios_withgrub}" = "y" ]
-	then
+	if [ "${payload_grub}" != "y" ] \
+			&& [ "${payload_seabios_withgrub}" != "y" ]; then
+		return 0
+	fi
+
 	if [ -f "payload/grub/grub_usqwerty.cfg" ]; then
 		sha1cmd="sha1sum resources/grub/config/grub.cfg"
 		grubrefchecksum="$(${sha1cmd} | awk '{print $1}')"
@@ -326,12 +332,14 @@ build_dependency_grub()
 			./build payload grub
 		fi
 	done
-	fi
 }
 
 build_dependency_uboot()
 {
-	if [ "${payload_uboot}" = "y" ]; then
+	if [ "${payload_uboot}" != "y" ]; then
+		return 0
+	fi
+
 	ubdir=""
 	if [ "${uboot_config}" = "default" ]; then
 		ubdir="payload/u-boot/${board}"
@@ -348,7 +356,6 @@ build_dependency_uboot()
 		rm -Rf "payload/u-boot/${board}" # just in case
 		./build payload u-boot "${board}"
 	fi
-	fi
 }
 
 build_rom_images()