Commit f317e69b authored by Jondy Zhao's avatar Jondy Zhao

slapos-windows-installer: fix msexec abort buildout process

parent e05d2f05
......@@ -11,11 +11,10 @@ recipe = slapos.recipe.cmmi
# This url is useless
path = $${buildout:directory}
pre-configure =
echo "#! /bin/bash" > $${:configure-command}
echo "declare -r installer=${installer:location}/slapos-windows-all-in-one.exe" >> $${:configure-command}
echo "declare -r targetdir=\$(cygpath -w $${buildout:directory})" >> $${:configure-command}
echo "declare -r logfile=\$(cygpath -w $${buildout:directory}/slapos-windows-installer.log)" >> $${:configure-command}
echo "\$installer /DIR=\"\$targetdir\" /LOG=\"\$logfile\" /VERYSILENT" >> $${:configure-command}
declare -r installer=${installer:location}/slapos-windows-all-in-one.exe
declare -r targetdir=$(cygpath -w $${buildout:directory})
declare -r logfile=$(cygpath -w $${buildout:directory}/slapos-windows-installer.log)
echo "$installer /DIR=\"\$targetdir\" /LOG=\"\$logfile\" /VERYSILENT" > $${:configure-command}
chmod +x $${:configure-command}
configure-command = $${buildout:directory}/bootloader.sh
pre-install =
......
......@@ -60,7 +60,7 @@ post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer
[instance-template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
md5sum = 0878ed717321d474d0d2d7a264779d76
md5sum = cc55040889f472f751f1aaa85e04e88f
output = ${buildout:directory}/instance.cfg
mode = 0644
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment