[X2Go-Commits] [pyhoca-gui] 15/18: NSIS script: empty installation destination before installing new files into $INSTDIR.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch brokerclient
in repository pyhoca-gui.

commit fa62f0f51e3ef98517d078f4fd0f39a15b632746
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 7 11:55:08 2014 +0100

    NSIS script: empty installation destination before installing new files into $INSTDIR.
---
 debian/changelog |    2 ++
 nsis_template.py |    3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f626033..3072169 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low
   * Don't refer to py2exe anymore in nsis_template's naming scheme.
   * Move setup_win32log to a separate module namespace.
   * Install more modules into setup.exe: hmac (for ecdsa).
+  * NSIS script: empty installation destination before installing new files
+    into $INSTDIR.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 08 Jan 2014 21:28:37 +0100
 
diff --git a/nsis_template.py b/nsis_template.py
index 0daa456..3adf94f 100644
--- a/nsis_template.py
+++ b/nsis_template.py
@@ -244,6 +244,9 @@ Section "{program_name} ($REQUIRED)"
   SectionIn RO
   ; Set output path to the installation directory.
   SetOutPath "$INSTDIR"
+  ; Empty $INSTDIR before writing new files to it.
+  RmDir /r "$INSTDIR\\*.*"
+  ; Install new files...
   File /r /x .svn /x .git "${{distOutputDirectory}}\\*.*"
 
   ; Write the installation path into the registry

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git