Cleaning up binary_loadlin.
authorDaniel Baumann <daniel@debian.org>
Sun, 6 Jan 2013 22:30:49 +0000 (23:30 +0100)
committerDaniel Baumann <daniel@debian.org>
Sun, 6 Jan 2013 22:30:49 +0000 (23:30 +0100)
scripts/build/binary_loadlin

index 9a8e6a4..1bbe1b2 100755 (executable)
@@ -45,33 +45,39 @@ Create_lockfile .lock
 
 case "${LB_ARCHITECTURES}" 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