slapos-windows-installer: fix $$ problem in the instance.cfg.in

software/slapos-windows-installer/instance.cfg.in

@@ -19,12 +19,12 @@ pre-configure =
   chmod +x $${:configure-command}
 configure-command = $${buildout:directory}/bootloader.sh
 pre-install =
-  declare -r cyghome="$$(cygpath -m -a /)/.."
-  cp $$cyghome/setup.exe $${buildout:directory}
-  cp $$cyghome/certificate $${buildout:directory}/cygwin/certificate
-  cp $$cyghome/key $${buildout:directory}/cygwin/key
-  cp $$cyghome/test-computer.crt $${buildout:directory}/cygwin/computer.crt
-  cp $$cyghome/test-computer.key $${buildout:directory}/cygwin/computer.key
+  declare -r cyghome="$(cygpath -m -a /)/.."
+  cp $cyghome/setup.exe $${buildout:directory}
+  cp $cyghome/certificate $${buildout:directory}/cygwin/certificate
+  cp $cyghome/key $${buildout:directory}/cygwin/key
+  cp $cyghome/test-computer.crt $${buildout:directory}/cygwin/computer.crt
+  cp $cyghome/test-computer.key $${buildout:directory}/cygwin/computer.key
   cp ${installer:cygroot}/slapos-windows-wrapper.bat $${buildout:directory}/slapos-windows-wrapper.bat
 make-binary = true
 # The parameter "slaptester" is the password of slapos administrator

software/slapos-windows-installer/software.cfg

@@ -45,6 +45,7 @@ pre-configure=
   mkdir -p ${:cygroot}/cygwin
   (cd ${:cygroot} ; tar xjf ${inno-setup:location}/inno-setup.tar.bz2)
   (cd ${:cygroot} ; tar xjf ${cygwin-packages:location}/cygwin-packages.tar.bz2)
+  cp $(cygpath -m -a /)/../setup.exe ${:cygroot}
   cp ${slapos-build-installer:location}/slapos-build-installer ${:cygroot}/cygwin
   cp ${slapos-windows-wrapper:location}/slapos-windows-wrapper.bat ${:cygroot}
   cp ${setup-cygwin:location}/setup-cygwin.bat ${:cygroot}
@@ -59,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 = b78830f4591aa7ac93675348c51a1e90
+md5sum = 0878ed717321d474d0d2d7a264779d76
 output = ${buildout:directory}/instance.cfg
 mode = 0644