summaryrefslogtreecommitdiff
path: root/scripts/build/binary_win32-loader
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-09-29 13:08:14 +0200
committerDaniel Baumann <daniel@debian.org>2012-09-29 13:08:14 +0200
commit6b12a3fb7d2c3066b95180ea2bed5364986a4400 (patch)
treedd5eeafe90ec8ba2425116b5ac25a8309522658b /scripts/build/binary_win32-loader
parent3e72045807ea24662e18ad12d5bbb4154fb1627b (diff)
downloadvyos-live-build-6b12a3fb7d2c3066b95180ea2bed5364986a4400.tar.gz
vyos-live-build-6b12a3fb7d2c3066b95180ea2bed5364986a4400.zip
Updating win32-loader inclusion handling.
Diffstat (limited to 'scripts/build/binary_win32-loader')
-rwxr-xr-xscripts/build/binary_win32-loader6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index f8650351a..4789398a1 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -69,6 +69,12 @@ case "${LB_ARCHITECTURES}" in
mv binary/win32-loader-standalone.exe binary/setup-standalone.exe
fi
+ if ls binary/win32-loader/g2ldr* > /dev/null 2>&1
+ then
+ mv binary/win32-loader/g2ldr* binary
+ rmdir binary/win32-loader > /dev/null 2>&1 || true
+ fi
+
if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then