Fix-478 incremental update, review fixes

Signed-off-by: Bala Raman <[email protected]>

Author: srbala

dockerfile_functions.sh

@@ -480,9 +480,9 @@ EOI
 print_ubi_slim_package() {
 	cat >> "$1" <<-EOI
     export PATH="${jhome}/bin:\$PATH"; \\
-	dnf install -y binutils; \\
+    dnf install -y binutils; \\
     /usr/local/bin/slim-java.sh ${jhome}; \\
-	dnf remove -y binutils; \\
+    dnf remove -y binutils; \\
     dnf clean all; \\
 EOI
 }
@@ -491,9 +491,9 @@ EOI
 print_ubi-minimal_slim_package() {
 	cat >> "$1" <<-EOI
     export PATH="${jhome}/bin:\$PATH"; \\
-	microdnf install -y binutils; \\
+    microdnf install -y binutils; \\
     /usr/local/bin/slim-java.sh ${jhome}; \\
-	microdnf remove -y binutils; \\
+    microdnf remove -y binutils; \\
     microdnf clean all; \\
 EOI
 }
@@ -681,11 +681,12 @@ RUN set -eux; \\
     case "\${ARCH}" in \\
 EOI
 	print_java_install_pre "${file}" "${pkg}" "${bld}" "${btype}" "${osfamily}" "${os}"
-	if [ "${btype}" == "slim" && ${os} == "ubi"]; then
-		print_ubi_slim_package "$1"
-	fi
-	if [ "${btype}" == "slim" && ${os} == "ubi-minimal"]; then
-		print_ubi-minimal_slim_package "$1"
+	if [ "${btype}" == "slim" ]; then
+		if [ ${os} == "ubi" ]; then	
+			print_ubi_slim_package "$1"	
+		elif [ ${os} == "ubi-minimal"]; then
+			print_ubi-minimal_slim_package "$1"
+		fi
 	fi
 	print_java_install_post "$1"
 }