Fix some things that had got broken

nsist/__init__.py

@@ -188,7 +188,8 @@ class InstallerBuilder(object):
                            'ARCH_TAG': '.amd64' if (self.py_bitness==64) else '',
                           },
             )
-        
+
+        logger.info('Writing NSI file to %s', self.nsi_file)
         nsis_writer.write(self.nsi_file)    
 
     def run_nsis(self):
@@ -225,10 +226,12 @@ class InstallerBuilder(object):
         self.prepare_shortcuts()
         
         # Packages
-        
+        self.prepare_packages()
         
         # Extra files
         self.copy_extra_files()
+
+        self.write_nsi()
     
         exitcode = self.run_nsis()
         

nsist/nsiswriter.py

@@ -78,7 +78,7 @@ class NSISFileWriter(object):
             yield 'CreateShortCut "$SMPROGRAMS\{}.lnk" "{}" \'"$INSTDIR\{}"\' \\'.format(\
                     scname, ('py' if sc['console'] else 'pyw'), sc['script'])
             yield '    "$INSTDIR\{}"'.format(sc['icon'])
-            yield 'SetOutPath "$INSTDIR"
+            yield 'SetOutPath "$INSTDIR"'
             return
         
         # Multiple shortcuts - make a folder