[mkgmap-dev] NSIS module patch

Tue Mar 16 01:38:08 GMT 2010

Hello,

This is a patch for the NSIS module. I have seen that on some occasions 
the uninstaller does not get remove at uninstall and that moving it to 
be the last file removed improves the behavior.


Index: src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java
===================================================================

--- src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java	(revision 1603)
+++ src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java	(working copy)
@@ -160,7 +160,6 @@
  			// Un-install files
  			pw.format(Locale.ROOT, "Section \"Uninstall\"\n");
  			pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\${MAPNAME}.img\"\n");
-			pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\Uninstall.exe\"\n");
  			if (hasIndex) {
  				pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\${MAPNAME}_mdr.img\"\n");
  				pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\${MAPNAME}.mdx\"\n");
@@ -171,6 +170,7 @@
  			for (String file : mapList) {
  				pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\%s.img\"\n", file);
  			}
+			pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\Uninstall.exe\"\n");
  			pw.println();
  			pw.format(Locale.ROOT, "  RmDir \"$INSTDIR\"\n");


Thanks,

   N.

