Cleaning up binary_loadlin.

1 files changed, 36 insertions, 30 deletions

diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin
index a27be4b57..74884718e 100755
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@@ -45,33 +45,39 @@ Create_lockfile .lock
 
 case "${LIVE_IMAGE_ARCHITECTURE}" in
 	amd64|i386)
-		if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
-		then
-			# Checking depends
-			Check_package chroot/usr/lib/loadlin/loadlin.exe.gz loadlin
-
-			# Restoring cache
-			Restore_cache cache/packages.binary
-
-			# Installing depends
-			Install_package
-
-			# Copying loadlin
-			mkdir -p binary/tools
-			gunzip -c chroot/usr/lib/loadlin/loadlin.exe.gz > binary/tools/loadlin.exe
-			gunzip -c chroot/usr/share/doc/loadlin/manual.txt.gz > binary/tools/loadlin.txt
-
-			# Saving cache
-			Save_cache cache/packages.binary
-
-			# Removing depends
-			Remove_package
-		else
-			# Copying loadlin
-			mkdir -p binary/tools
-			gunzip -c /usr/lib/loadlin/loadlin.exe.gz > binary/tools/loadlin.exe
-			gunzip -c /usr/share/doc/loadlin/manual.txt.gz > binary/tools/loadlin.txt
-		fi
+		case "${LB_BUILD_WITH_CHROOT}" in
+			true)
+				# Checking depends
+				Check_package chroot/usr/lib/loadlin/loadlin.exe.gz loadlin
+
+				# Restoring cache
+				Restore_cache cache/packages.binary
+
+				# Installing depends
+				Install_package
+
+				_PREFIX="chroot"
+				;;
+
+			false)
+				_PREFIX=""
+				;;
+		esac
+
+		# Copying loadlin
+		mkdir -p binary/tools
+		gunzip -c "${_PREFIX}/usr/lib/loadlin/loadlin.exe.gz" > binary/tools/loadlin.exe
+		gunzip -c "${_PREFIX}/usr/share/doc/loadlin/manual.txt.gz" > binary/tools/loadlin.txt
+
+		case "${LB_BUILD_WITH_CHROOT}" in
+			true)
+				# Saving cache
+				Save_cache cache/packages.binary
+
+				# Removing depends
+				Remove_package
+				;;
+		esac
 
 cat > binary/install/install.bat << EOF
 \tools\loadlin.exe vmlinuz initrd=initrd.gz
@@ -85,12 +91,12 @@ cat > binary/install/gtk/install.bat << EOF
 EOF
 
 		fi
+
+		# Creating stage file
+		Create_stagefile .build/binary_loadlin
 		;;
 
 	*)
 		Echo_warning "loadlin inclusion is set to true but not compatible with your architecture, ignoring."
 		;;
 esac
-
-# Creating stage file
-Create_stagefile .build/binary_loadlin