Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos
Commits
f317e69b
Commit
f317e69b
authored
Aug 01, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-windows-installer: fix msexec abort buildout process
parent
e05d2f05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
software/slapos-windows-installer/instance.cfg.in
software/slapos-windows-installer/instance.cfg.in
+4
-5
software/slapos-windows-installer/software.cfg
software/slapos-windows-installer/software.cfg
+1
-1
No files found.
software/slapos-windows-installer/instance.cfg.in
View file @
f317e69b
...
...
@@ -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 =
...
...
software/slapos-windows-installer/software.cfg
View file @
f317e69b
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment