[X2Go-Commits] [pyhoca-gui] 53/71: CVix: more NSIS tweaking

[git-admin at x2go.org]

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

x2go pushed a commit to branch cvix/2.x
in repository pyhoca-gui.

commit 19432fec0f2f6f207dd18cdb37ce760830f212f5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 20 22:59:21 2014 +0100

    CVix: more NSIS tweaking
---
 CVix_nsis_template.py |   24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py
index 1c6df7e..ce078ec 100644
--- a/CVix_nsis_template.py
+++ b/CVix_nsis_template.py
@@ -24,14 +24,6 @@ NSIS_SCRIPT_TEMPLATE = """
 
 !define VERSION {program_version}
 
-var GSCRIPT_VERSION
-var GSVIEW_VERSION
-var GSCRIPT_INSTALLER
-
-StrCpy $GSCRIPT_VERSION "9.10"
-StrCpy $GSVIEW_VERSION "5.0"
-StrCpy $GSCRIPT_INSTALLER "gs910w32.exe"
-
 ;--------------------------------
 
 ; The name of the installer
@@ -170,14 +162,6 @@ var WITHOUT_PULSEAUDIO
 
 Function .onInit
 
-        var GSCRIPT_VERSION
-        var GSCRIPT_INSTALLER
-        StrCpy $GSCRIPT_VERSION "9.10"
-        StrCpy $GSCRIPT_INSTALLER "gs910w32.exe"
-
-        var GSVIEW_VERSION
-        StrCpy $GSVIEW_VERSION "5.0"
-
 ;        ;Language selection dialog
 ;
         Push ""
@@ -280,14 +264,14 @@ Section "{program_name} ($REQUIRED)"
 
 SectionEnd
 
-Section "Ghostscript ($GSCRIPT_VERSION)"
+Section "Ghostscript (9.10)"
 
-  File "ghostscript\\$GSCRIPT_INSTALLER"
-  ExecWait "ghostscript\\$GSCRIPT_INSTALLER /S"
+  File "ghostscript\\gs910w32.exe"
+  ExecWait "ghostscript\\gs910w32.exe /S"
 
 SectionEnd
 
-Section "GSView ($GSVIEW_VERSION)"
+Section "GSView (5.0)"
 
   File "gsview\\setup.exe"
   ExecWait "gsview\\setup.exe"

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