From de67e1094fe85551c8395e6d7c471cdd122de855 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Tue, 27 Nov 2012 21:39:15 +0000
Subject: [PATCH] Combines regular expressions as proposed by Ingo Bauersachs.

---
 resources/install/build.xml | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 16567e282..a866c7c05 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -389,30 +389,14 @@
             <entry key="changes_html" value="updates/index.html" />
         </propertyfile>
 
-        <!-- removes spaces from application name if any -->
+        <!-- removes spaces,-,_ from application name if any -->
         <propertyregex property="app.exe.filename"
             input="${application.name}"
-            regexp=" "
+            regexp="[ -_]"
             replace=""
             override="true"
             global="true"
             defaultValue="${application.name}"/>
-        <!-- removes '-' from app.exe.filename if any -->
-        <propertyregex property="app.exe.filename"
-            input="${app.exe.filename}"
-            regexp="-"
-            replace=""
-            override="true"
-            global="true"
-            defaultValue="${app.exe.filename}"/>
-        <!-- removes '_' from app.exe.filename if any -->
-        <propertyregex property="app.exe.filename"
-            input="${app.exe.filename}"
-            regexp="-"
-            replace=""
-            override="true"
-            global="true"
-            defaultValue="${app.exe.filename}"/>
         <!-- if wix.app.launcher.name is not set use app.exe.filename
             If using wix.app.launcher.name make sure not to use spaces,-,_
             in the name.